完善预约单和维修工单数据权限

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -84,9 +84,9 @@ public class AsBusrepairBill extends BaseEntity {
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
     @ApiModelProperty("制单部门sid")
-    private String deptSid;
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String dept;
+    private String deptName; // 制单部门
     @ApiModelProperty("班组sid")
     private String groupSid;
     @ApiModelProperty("班组名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -28,9 +28,9 @@ public class AsBusrepairBillDetailsVo implements Vo {
     @ApiModelProperty("制单人sid")
     private String createBySid;
     @ApiModelProperty("制单部门sid")
-    private String deptSid;
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String dept;
+    private String deptName; // 制单部门
     @ApiModelProperty("制单人姓名")
     private String createByName;
     @ApiModelProperty("操作人Sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -25,9 +25,9 @@ public class AsBusrepairBillDto implements Dto {
     @ApiModelProperty("班组名称")
     private String groupName;
     @ApiModelProperty("制单部门sid")
-    private String deptSid;
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String dept;
+    private String deptName; // 制单部门
     @ApiModelProperty("操作人Sid")
     private String operatorSid;
     @ApiModelProperty("操作人")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java

@@ -91,9 +91,9 @@ public class AsBusreserveBill extends BaseEntity {
     @ApiModelProperty("组织全路径")
     private String orgSidPath; // 组织全路径
     @ApiModelProperty("制单部门sid")
-    private String createDeptSid; // 制单部门sid
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String createDept; // 制单部门
+    private String deptName; // 制单部门
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@@ -92,9 +92,9 @@ public class AsBusreserveBillDetailsVo implements Vo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("制单部门sid")
-    private String createDeptSid; // 制单部门sid
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String createDept; // 制单部门
+    private String deptName; // 制单部门
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@@ -92,9 +92,9 @@ public class AsBusreserveBillDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("制单部门sid")
-    private String createDeptSid; // 制单部门sid
+    private String deptSid; // 制单部门sid
     @ApiModelProperty("制单部门")
-    private String createDept; // 制单部门
+    private String deptName; // 制单部门
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -38,7 +38,7 @@
                b.billNo,
                b.nodeName,
                b.useOrgName,
-               b.dept,
+               b.deptName,
                b.createByName,
                b.createTime,
                b.billType,
@@ -59,6 +59,7 @@
         FROM as_busrepair_bill AS b
                  LEFT JOIN as_busrepair_bill_vech AS v ON b.sid = v.billSid
                  LEFT JOIN as_busrepair_bill_invoice AS i ON b.sid = i.billSid
+        LEFT JOIN anrui_portal.sys_organization as s ON b.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -113,7 +114,7 @@
     <select id="billPageList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo">
         select a.sid,
                a.useOrgName,
-               a.dept as deptName,
+               a.deptName,
                a.createByName,
                a.subject,
                DATE_FORMAT(a.entryTime, '%Y-%m-%d')           as entryTime,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -54,10 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @description:
@@ -97,6 +94,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
     @Autowired
     private AsBusclaimBillService asBusclaimBillService;
+
     /**
      * 维修领料获取派工单
      *
@@ -510,16 +508,16 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 String orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("b.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("2".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("b.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("3".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("b.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("b.orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("5".equals(orgLevelKey)) {
                     qw.eq("b.createBySid", query.getUserSid());
                 } else {
@@ -530,12 +528,27 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 PagerVo<AsBusrepairBillVo> p = new PagerVo<>();
                 return p;
             }
+        } else {
+            String deptSid = "";
+            String orgPath = query.getOrgPath();
+            if (StringUtils.isNotBlank(orgPath)) {
+                List<String> split = Arrays.asList(orgPath.split("/"));
+                if (split.size() > 1) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                    deptSid = sysOrganization1.getSid();
+                } else {
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                    deptSid = sysOrganization.getSid();
+                }
+            }
+            qw.eq("b.deptSid", deptSid);
         }
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("b.useOrgName", query.getUseOrgName());
         }
         if (StringUtils.isNotBlank(query.getDept())) {
-            qw.like("b.dept", query.getDept());
+            qw.like("b.deptName", query.getDept());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("b.createByName", query.getCreateByName());
@@ -595,7 +608,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         if (StringUtils.isNotBlank(query.getNodeCode())) {
             qw.eq("b.nodeCode", query.getNodeCode());
         }
-        qw.eq("1", "1");
         qw.orderByDesc("b.createTime");
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairBillVo> pagging = baseMapper.listPage(page, qw);
@@ -853,7 +865,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         for (AsBusrepairBillPageListVo record : pagging.getRecords()) {
             List<String> billNos = asBusclaimBillService.selectByRepairBillSid(record.getSid());
             record.setNum(String.valueOf(billNos.size()));
-            record.setSpdBillNo(String.join(",",billNos));
+            record.setSpdBillNo(String.join(",", billNos));
         }
         PagerVo<AsBusrepairBillPageListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java

@@ -26,4 +26,6 @@ public interface AsBusrepairInventorybillMapper extends BaseMapper<AsBusrepairIn
     IPage<AsBusrepairInventorybillVo> pageList(IPage<AsBusrepairInventorybill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairInventorybill> qw);
 
     String selOutBoundCount(@Param("sourceBillSid") String sourceBillSid, @Param("busTypeKey")String busTypeKey, @Param("goodsID")String goodsID);
+
+    int selectNum(String bill);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@@ -23,4 +23,9 @@
                 LEFT JOIN as_busrepair_inventorybill AS b ON d.billSid = b.sid
         WHERE d.goodsID = #{goodsID} AND b.sourceBillSid = #{sourceBillSid} AND b.busTypeKey = #{busTypeKey}
     </select>
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
+        from as_busrepair_inventorybill
+        where billNo LIKE concat(#{bill}, '%')
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -34,16 +34,10 @@ public class AsBusrepairInventorybillRest {
         return asBusrepairInventorybillService.saveOrUdateBill(dto);
     }
 
-   /* @PostMapping("/outBill")
-    @ApiOperation("出库")
-    ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) {
-        return asBusrepairInventorybillService.outBill(dto);
-    }*/
-
     @PostMapping("/outBill")
     @ApiOperation("出库")
     ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) {
-        return asBusrepairInventorybillService.outBill(dto);
+        return asBusrepairInventorybillService.newOutBill(dto);
     }
 
     @PostMapping("/quitBill")
@@ -74,4 +68,5 @@ public class AsBusrepairInventorybillRest {
     }
 
 
+
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -4,17 +4,19 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillDetailsVo;
-import com.yxt.anrui.as.api.asbusrepairbill.GoodsDetailsVo;
 import com.yxt.anrui.as.api.asbusrepairbill.SitemVo;
 import com.yxt.anrui.as.api.asbusrepairinventorybill.*;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
-import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
+import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
+import com.yxt.anrui.as.api.utils.AsRule;
+import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
 import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto;
 import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDto;
@@ -29,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -51,6 +54,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private AsBusrepairBillService asBusrepairBillService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     /**
      * 维修出/退库分页列表
@@ -166,6 +171,61 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         return rb.success();
     }
 
+    /**
+     * 生成单据编号
+     *
+     * @param orgSid
+     * @return
+     */
+    public String getApplyCode(String orgSid, String billType) {
+        //获取分公司sid
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        AsBillNo b = new AsBillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(billType);
+        String bill = AsRule.getBill(b);
+        int i = baseMapper.selectNum(bill);
+        String billNo = AsRule.getBillNo(bill, i);
+        return billNo;
+    }
+
+
+    public ResultBean newOutBill(AsBusrepairInventorybillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = saveBill(dto, "0");
+        return rb.success().setData(sid);
+    }
+
+    public String saveBill(AsBusrepairInventorybillDto dto, String busTypeKey) {
+        AsBusrepairInventorybill entity = new AsBusrepairInventorybill();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        if (busTypeKey.equals("0")) {
+            entity.setBusTypeKey("0");
+            entity.setBusTypeValue("维修出库");
+            String billNo = getApplyCode(dto.getCreateOrgSid(), "WXCKD");
+            entity.setBillNo(billNo);
+        } else if (busTypeKey.equals("1")) {
+            entity.setBusTypeKey("1");
+            entity.setBusTypeValue("维修退库");
+            String billNo = getApplyCode(dto.getCreateOrgSid(), "WXTKD");
+            entity.setBillNo(billNo);
+        }
+        baseMapper.insert(entity);
+        List<AsBusrepairInventorybillDetailSDto> detailList = dto.getDetailList();
+        if (!detailList.isEmpty()) {
+            for (AsBusrepairInventorybillDetailSDto sDto : detailList) {
+                AsBusrepairInventorybillDetail detail = new AsBusrepairInventorybillDetail();
+                BeanUtil.copyProperties(sDto, detail);
+                if (StringUtils.isNotBlank(sDto.getOutboundCount())) {
+                    detail.setCurrentCount(new BigDecimal(sDto.getOutboundCount()));
+                }
+
+            }
+        }
+        return entity.getSid();
+    }
+
     public ResultBean<InventoryBillDetailsVo> details(String sid) {
         ResultBean<InventoryBillDetailsVo> rb = ResultBean.fireFail();
         AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -373,8 +373,8 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             billDto.setOperatorSid(bill.getCreateBySid());
             billDto.setCreateByName(bill.getCreateByName());
             billDto.setOperator(bill.getCreateByName());
-            billDto.setDept(bill.getCreateDept());
-            billDto.setDeptSid(bill.getCreateDeptSid());
+            billDto.setDeptName(bill.getDeptName());
+            billDto.setDeptSid(bill.getDeptSid());
             if (StringUtils.isNotBlank(bill.getCustomerSid())) {
                 billDto.setCustomerSid(bill.getCustomerSid());
             }