Sfoglia il codice sorgente

批量外协周转

ezhizao_zx 5 mesi fa
parent
commit
bf349ad5b9

+ 1 - 1
src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -650,7 +650,7 @@ public class BizReturnReceiptController extends BaseController
 带箱方式,是整单的。如果换新箱子,明细中,都需要更换箱子
      */
     @PreAuthorize("@ss.hasPermi('business:returnReceipt:remove')")
-    @Log(title = "删除外协单", businessType = BusinessType.DELETE)
+    @Log(title = "删除收回单", businessType = BusinessType.DELETE)
     @Transactional
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)

+ 3 - 1
src/main/java/cn/ezhizao/project/business/controller/BizReturnTurnoverController.java

@@ -542,7 +542,9 @@ public class BizReturnTurnoverController extends BaseController {
                         subPlan.setResourceGroupId(info.getId());
                         subPlan.setDeptId(outsourcedOrderDetail.getProductionDeptId());
                         subPlan.setResourceGroupCode(info.getCode());
-                        subPlanList.add(subPlan);
+                        if(subPlanList.stream().noneMatch(v -> v.getProductionPlanDetailId().equals(subPlan.getProductionPlanDetailId()))) {
+                            subPlanList.add(subPlan);
+                        }
                     }
                 }