Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@@ -755,7 +755,8 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
         AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(sourceSid);
         if (null != asBusrepairBill) {
             if (asBusrepairBill.getSubject().equals("保内")) {
-                if (asBusrepairBill.getOldIsReclaim() != 1) {
+                int count2 = asBusrepairBillService.selOldIsInInventoryCount(sourceSid);
+                if (count2 > 0) {
                     return rb.setMsg("请先完成旧件入库，再进行操作！");
                 }
             }

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

@@ -85,4 +85,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
     int getToDoNum(@Param("userSid") String userSid);
 
     int getToDoNum2(@Param("useOrgSid") String useOrgSid);
+
+    int selOldIsInInventoryCount(@Param("sid") String sid);
 }

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

@@ -909,6 +909,19 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selOldIsInInventoryCount" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill AS b ON d.billSid = b.sid
+                LEFT JOIN as_busrepair_bill AS a ON b.sourceBillSid = a.sid
+        WHERE
+            a.sid = #{sid}
+          AND d.isEnable = 1
+          AND d.currentCount > 0
+          AND ( d.oldIsInInventory != 1 OR d.oldIsInInventory IS NULL OR d.oldIsInInventory = '' )
+    </select>
 
 
 </mapper>

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

@@ -386,4 +386,28 @@ public class AsBusrepairBillRest {
         PagerVo<BusinessDetailsVo> pv = asBusrepairBillService.businessDetails(pq);
         return rb.success().setData(pv);
     }
+
+    @PostMapping("/commissionSummary")
+    @ApiOperation("业绩提成汇总表")
+    ResultBean<PagerVo<BusinessDetailsVo>> commissionSummary(@RequestBody PagerQuery<BusinessDetailsQuery> pq) {
+        ResultBean<PagerVo<BusinessDetailsVo>> rb = ResultBean.fireFail();
+        PagerVo<BusinessDetailsVo> pv = asBusrepairBillService.businessDetails(pq);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/commissionSitem")
+    @ApiOperation("维修项目提成明细")
+    ResultBean<PagerVo<BusinessDetailsVo>> commissionSitem(@RequestBody PagerQuery<BusinessDetailsQuery> pq) {
+        ResultBean<PagerVo<BusinessDetailsVo>> rb = ResultBean.fireFail();
+        PagerVo<BusinessDetailsVo> pv = asBusrepairBillService.businessDetails(pq);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/commissionGoods")
+    @ApiOperation("配件销售提成明细")
+    ResultBean<PagerVo<BusinessDetailsVo>> commissionGoods(@RequestBody PagerQuery<BusinessDetailsQuery> pq) {
+        ResultBean<PagerVo<BusinessDetailsVo>> rb = ResultBean.fireFail();
+        PagerVo<BusinessDetailsVo> pv = asBusrepairBillService.businessDetails(pq);
+        return rb.success().setData(pv);
+    }
 }

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

@@ -160,6 +160,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     private YxtCrmCustomerTempFeign yxtCrmCustomerTempFeign;
     @Autowired
     private WmsInventoryFeign wmsInventoryFeign;
+
     /**
      * 维修领料获取派工单
      *
@@ -762,7 +763,6 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     }
 
 
-
                     sitemVos.add(sitemVo);
                 }
                 vo.setSitemVos(sitemVos);
@@ -1486,7 +1486,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         AsBusrepairBill asBusrepairBill = fetchBySid(sid);
         if (asBusrepairBill.getNodeCode() == 5) {
             if (asBusrepairBill.getSubject().equals("保内")) {
-                if (asBusrepairBill.getOldIsReclaim() != 1) {
+                int count = selOldIsInInventoryCount(sid);
+                if (count > 0) {
                     return rb.setMsg("请先完成旧件入库，再进行操作！");
                 }
                 asBusrepairBill.setMaterialConfirm(1);
@@ -1498,12 +1499,17 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         return rb.success();
     }
 
+    public int selOldIsInInventoryCount(String sid) {
+        return baseMapper.selOldIsInInventoryCount(sid);
+    }
+
     public ResultBean settle(String sid) {
         ResultBean rb = ResultBean.fireFail();
         AsBusrepairBill asBusrepairBill = fetchBySid(sid);
         if (asBusrepairBill.getNodeCode() == 5) {
             if (asBusrepairBill.getSubject().equals("保内")) {
-                if (asBusrepairBill.getOldIsReclaim() != 1) {
+                int count = selOldIsInInventoryCount(sid);
+                if (count > 0) {
                     return rb.setMsg("请先完成旧件入库，再进行操作！");
                 }
             }
@@ -2128,7 +2134,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             for (GoodsReceiveVo record : records) {
                 if (null != record) {
                     if (StringUtils.isNotBlank(record.getSid())) {
-                        List<GoodsReceiveListVo> list = baseMapper.selGoodsReceiveByBillSid(record.getSid(),userSid);
+                        List<GoodsReceiveListVo> list = baseMapper.selGoodsReceiveByBillSid(record.getSid(), userSid);
                         if (!list.isEmpty()) {
                             record.setList(list);
                         }
@@ -2977,5 +2983,4 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     }
 
 
-
 }