生产管理修改

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -126,13 +126,26 @@ public interface IErpDataProduceClient {
      * 返工订单完成
      */
     @GetMapping(COMPLETE_ORDER)
-    R<Boolean> completeOrder(@RequestParam(value = "redono") String redono, @RequestParam(value = "seqno") Integer seqno, @RequestParam(value = "prtno") String prtno, @RequestParam(value = "splcode") String splcode, @RequestParam(value = "amount") Double amount, @RequestParam(value = "bfqty") Integer bfqty, @RequestParam(value = "userName") String userName);
+    R<Boolean> completeOrder(@RequestParam(value = "redono") String redono,
+                             @RequestParam(value = "seqno") Integer seqno,
+                             @RequestParam(value = "prtno") String prtno,
+                             @RequestParam(value = "splcode") String splcode,
+                             @RequestParam(value = "amount") Double amount,
+                             @RequestParam(value = "bfqty", required = false) Integer bfqty,
+                             @RequestParam(value = "userName", required = false) String userName);
 
     /**
      * 返工无工艺
      */
     @GetMapping(RECEIVE_ORDER)
-    R<Boolean> receiveOrder(@RequestParam(value = "redono") String redono, @RequestParam(value = "seqno") Integer seqno, @RequestParam(value = "prtno") String prtno, @RequestParam(value = "splcode") String splcode, @RequestParam(value = "amount") Double amount, @RequestParam(value = "reqqty") String reqqty, @RequestParam(value = "userName") String userName, @RequestParam(value = "reworkgyFlag") int reworkgyFlag);
+    R<Boolean> receiveOrder(@RequestParam(value = "redono") String redono,
+                            @RequestParam(value = "seqno") Integer seqno,
+                            @RequestParam(value = "prtno") String prtno,
+                            @RequestParam(value = "splcode") String splcode,
+                            @RequestParam(value = "amount") Double amount,
+                            @RequestParam(value = "reqqty", required = false) String reqqty,
+                            @RequestParam(value = "userName", required = false) String userName,
+                            @RequestParam(value = "reworkgyFlag") int reworkgyFlag);
 
     /**
      * 查询返工无工艺订单

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java

@@ -522,6 +522,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         List<PrReworkProcessEntity> rpList = dsPartService.selectReworkPartCraft(rr.getPrtno(), rr.getRedono(), rr.getSplcode(), String.valueOf(rr.getSeqno()));
         if (CollectionUtils.isEmpty(rpList)) {
             //修改erp返工单工艺状态为无工艺
+            log.info("修改erp返工单工艺状态为无工艺，返工单号{}", rr.getRedono());
             return erpDataProduceClient.receiveOrder(rr.getRedono(), rr.getSeqno(), rr.getPrtno(), rr.getSplcode(), rr.getAmount(), rr.getReqqty(), AuthUtil.getUserName(), 0).getData();
         } else {
             return this.receiveOrderAndSave(rr, rpList);

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java

@@ -89,12 +89,12 @@ public class ErpDataProduceClient implements IErpDataProduceClient {
 
 	@Override
 	public R<Boolean> completeOrder(String redono, Integer seqno, String prtno, String splcode, Double amount, Integer bfqty, String userName) {
-		return R.status(erpDataProduceService.completeOrder(redono, seqno, prtno, splcode, amount, bfqty, userName));
+		return R.data(erpDataProduceService.completeOrder(redono, seqno, prtno, splcode, amount, bfqty, userName));
 	}
 
 	@Override
 	public R<Boolean> receiveOrder(String redono, Integer seqno, String prtno, String splcode, Double amount, String reqqty, String userName, int reworkgyFlag) {
-		return R.status(erpDataProduceService.receiveOrder(redono, seqno, prtno, splcode, amount, reqqty, userName, reworkgyFlag));
+		return R.data(erpDataProduceService.receiveOrder(redono, seqno, prtno, splcode, amount, reqqty, userName, reworkgyFlag));
 	}
 
 	@Override