内部外协

src/main/java/cn/ezhizao/project/business/controller/BizReturnTurnoverController.java

@@ -31,15 +31,14 @@ import java.util.stream.Stream;
 
 /**
  * 外协单主
-带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Controller
+ * 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Controller
  *
  * @author ezhizao
  * @date 2024-05-08
  */
 @RestController
 @RequestMapping("/business/returnTurnover")
-public class BizReturnTurnoverController extends BaseController
-{
+public class BizReturnTurnoverController extends BaseController {
     @Resource
     private IBizReturnReceiptService bizReturnReceiptService;
     @Resource
@@ -83,32 +82,31 @@ public class BizReturnTurnoverController extends BaseController
 
     /**
      * 查询外协单主
-带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     * 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
      */
     @PreAuthorize("@ss.hasPermi('business:returnTurnover:list')")
     @GetMapping("/getFinishedReturnList")
     @Log(title = "获取外协收回周转列表", businessType = BusinessType.SELECT)
-    public TableDataInfo getFinishedReturnList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo getFinishedReturnList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizOutsourcedOrderDetail);
-        if(bizOutsourcedOrderDetail.getStartTime()!=null) {
-            bizOutsourcedOrderDetail.setStartTime(bizOutsourcedOrderDetail.getStartTime()+ " 00:00:00");
+        if (bizOutsourcedOrderDetail.getStartTime() != null) {
+            bizOutsourcedOrderDetail.setStartTime(bizOutsourcedOrderDetail.getStartTime() + " 00:00:00");
         }
-        if(bizOutsourcedOrderDetail.getEndTime()!=null) {
-            bizOutsourcedOrderDetail.setEndTime(bizOutsourcedOrderDetail.getEndTime()+ " 23:59:59");
+        if (bizOutsourcedOrderDetail.getEndTime() != null) {
+            bizOutsourcedOrderDetail.setEndTime(bizOutsourcedOrderDetail.getEndTime() + " 23:59:59");
         }
         startPage();
         List<BizOutsourcedOrderDetail> list = bizOutsourcedOrderDetailService.getFinishedReturnList(bizOutsourcedOrderDetail);
-        list.forEach(item->{
-            if(item.getInspectionStatus()==null) {
+        list.forEach(item -> {
+            if (item.getInspectionStatus() == null) {
                 item.setInspectionStatus(-1);
             }
         });
         //查询周转到外协的工序
         List<Long> outsourceDetailIds = list.stream().map(BizOutsourcedOrderDetail::getId).collect(Collectors.toList());
         List<Long> dayworkIds = list.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList());
-        List<BizDaywork> dayworks = bizDayworkService.query().in("id", dayworkIds.isEmpty()? Collections.singletonList(0L): dayworkIds).list();
-        if(!dayworkIds.isEmpty()) {
+        List<BizDaywork> dayworks = bizDayworkService.query().in("id", dayworkIds.isEmpty() ? Collections.singletonList(0L) : dayworkIds).list();
+        if (!dayworkIds.isEmpty()) {
             List<BizOutsourcedOrderDetailProcess> outsourceDetailProcess = bizOutsourcedOrderDetailProcessService.query().in("detail_id", outsourceDetailIds).list();
             //如果下道序扫码开始新批次了，则不能编辑载具和周转信息
             List<BizDayworkItem> dayworkItemList = bizDayworkItemService.getListByDayworkIds(dayworkIds);
@@ -118,7 +116,7 @@ public class BizReturnTurnoverController extends BaseController
                 BizOutsourcedOrderDetailProcess lastProcess = outsourceDetailProcess.stream().filter(process -> process.getDetailId().equals(detail.getId())).sorted(Comparator.comparing(BizOutsourcedOrderDetailProcess::getProcessStepNumber).reversed()).collect(Collectors.toList()).get(0);
                 //拿到最新的一条报工
                 BizDayworkItem lastItem = dayworkItemList.stream().filter(dayworkItem -> dayworkItem.getDayworkId().equals(detail.getDayworkId())).sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).thenComparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).stream().findFirst().orElse(null);
-                if(lastItem != null  && !Objects.equals(lastProcess.getProcessStepNumber(), lastItem.getProcessStepNumber())) {
+                if (lastItem != null && !Objects.equals(lastProcess.getProcessStepNumber(), lastItem.getProcessStepNumber())) {
                     detail.setFlag(false);
                 }
                 BizDaywork daywork = dayworks.stream().filter(l -> l.getId().equals(detail.getDayworkId())).findFirst().orElse(null);
@@ -157,60 +155,59 @@ public class BizReturnTurnoverController extends BaseController
         }
         return getDataTable(list);
     }
+
     @PostMapping("/getNowBindCarriers")
     @Log(title = "获取当前绑定载具", businessType = BusinessType.SELECT)
-    public AjaxResult getNowBindCarriers(@ RequestBody BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", bizOutsourcedOrderDetail.getDayworkId()).eq("is_changed",0).list();
-                if(!bizOutsourcedOrderDetail.getProductionCarrier().isEmpty()) {
-                    List<String> carrierCode = Arrays.stream(bizOutsourcedOrderDetail.getProductionCarrier().split(",")).collect(Collectors.toList());
-                    List<Long> carrierIds = bizDayworkCarrierService.query().in("carrier_code", carrierCode).eq("is_changed",0).list().stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList());
-                    bizOutsourcedOrderDetail.setDayworkCarrierList(dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList()));
-                    bizOutsourcedOrderDetail.setCarrierIds(carrierIds);
-                }else {
-                    //用的原箱
-                    if ("0".equals(bizOutsourcedOrderDetail.getPackagingMethod())) {
-                        List<Long> carrierIds = dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList());
-                        bizOutsourcedOrderDetail.setCarrierIds(carrierIds);
-                        bizOutsourcedOrderDetail.setDayworkCarrierList(dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList()));
-                    } else {
-                        //外协使用新箱，则把新箱解绑，返回空
-                        List<BizDayworkCarrier> wxCarrier = dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList());
-                        wxCarrier.stream().forEach(carrier -> {
-                            carrier.setIsChanged(1);
-                        });
-                        bizDayworkCarrierService.updateBatchById(wxCarrier);
-                        bizOutsourcedOrderDetail.setCarrierIds(new ArrayList<>());
-                    }
-                }
-                return success(bizOutsourcedOrderDetail);
+    public AjaxResult getNowBindCarriers(@RequestBody BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
+        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", bizOutsourcedOrderDetail.getDayworkId()).eq("is_changed", 0).list();
+        if (!bizOutsourcedOrderDetail.getProductionCarrier().isEmpty()) {
+            List<String> carrierCode = Arrays.stream(bizOutsourcedOrderDetail.getProductionCarrier().split(",")).collect(Collectors.toList());
+            List<Long> carrierIds = bizDayworkCarrierService.query().in("carrier_code", carrierCode).eq("is_changed", 0).list().stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList());
+            bizOutsourcedOrderDetail.setDayworkCarrierList(dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList()));
+            bizOutsourcedOrderDetail.setCarrierIds(carrierIds);
+        } else {
+            //用的原箱
+            if ("0".equals(bizOutsourcedOrderDetail.getPackagingMethod())) {
+                List<Long> carrierIds = dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList());
+                bizOutsourcedOrderDetail.setCarrierIds(carrierIds);
+                bizOutsourcedOrderDetail.setDayworkCarrierList(dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList()));
+            } else {
+                //外协使用新箱，则把新箱解绑，返回空
+                List<BizDayworkCarrier> wxCarrier = dayworkCarrierList.stream().filter(carrier -> carrier.getDayworkId().equals(bizOutsourcedOrderDetail.getDayworkId())).collect(Collectors.toList());
+                wxCarrier.stream().forEach(carrier -> {
+                    carrier.setIsChanged(1);
+                });
+                bizDayworkCarrierService.updateBatchById(wxCarrier);
+                bizOutsourcedOrderDetail.setCarrierIds(new ArrayList<>());
             }
+        }
+        return success(bizOutsourcedOrderDetail);
+    }
 
     /**
      * 查询周转工段
      */
     @GetMapping("/getTurnoverDeptList")
     @Log(title = "获取周转部门列表", businessType = BusinessType.SELECT)
-    public AjaxResult getTurnoverDeptList(BizReturnReceiptDetail bizReturnReceiptDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult getTurnoverDeptList(BizReturnReceiptDetail bizReturnReceiptDetail) throws NoSuchFieldException, IllegalAccessException {
         List<SysDept> departments = new ArrayList<>();
-        BizDaywork daywork = bizDayworkService.query().eq("id",bizReturnReceiptDetail.getDayworkId()).list().get(0);
+        BizDaywork daywork = bizDayworkService.query().eq("id", bizReturnReceiptDetail.getDayworkId()).list().get(0);
         daywork.setProcessStepNumber(bizReturnReceiptDetail.getProcessStepNumber());
         BizDaywork info = new BizDaywork();
-        if(daywork.getIsWasteRecycling() == 1 || daywork.getIsAmend() == 1) {
+        if (daywork.getIsWasteRecycling() == 1 || daywork.getIsAmend() == 1) {
             departments = bizReturnReceiptDetailService.getTurnoverAbDeptList(daywork);
-        }else {
+        } else {
             departments = bizReturnReceiptDetailService.getTurnoverDeptList(daywork);
         }
         return success(departments);
     }
+
     @PostMapping("/getProcessInspectionList")
     @Log(title = "获取工序", businessType = BusinessType.SELECT)
-    public AjaxResult getProcessInspectionList(@RequestBody BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult getProcessInspectionList(@RequestBody BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException {
         Boolean flag = false;
         List<BizProcessInspecion> processInspecions = bizProcessInspecionService.query().eq("return_receipt_detail_id", bizOutsourcedOrderDetailProcess.getReturnReceiptDetailId()).orderByDesc("create_time").list();
-        if (processInspecions.size()>0 &&processInspecions.get(0).getStatus()==1) {
+        if (processInspecions.size() > 0 && processInspecions.get(0).getStatus() == 1) {
             flag = true;
             return success(flag);
         }
@@ -219,29 +216,28 @@ public class BizReturnTurnoverController extends BaseController
 
     @PostMapping("/getProcessInspectionLists")
     @Log(title = "获取序检列表", businessType = BusinessType.SELECT)
-    public AjaxResult getProcessInspectionLists(@RequestBody List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult getProcessInspectionLists(@RequestBody List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException {
         boolean flag = false;
         List<BizProcessInspecion> processInspecions = bizProcessInspecionService.query().in("return_receipt_detail_id", bizOutsourcedOrderDetailProcess.stream().map(BizOutsourcedOrderDetailProcess::getReturnReceiptDetailId).collect(Collectors.toList())).orderByDesc("create_time").list();
-        if (processInspecions.size()>0 && bizOutsourcedOrderDetailProcess.stream().allMatch(t -> processInspecions.stream().filter(e -> e.getStatus().equals(1)).anyMatch(e -> e.getReturnReceiptDetailId().equals(t.getReturnReceiptDetailId())))) {
+        if (processInspecions.size() > 0 && bizOutsourcedOrderDetailProcess.stream().allMatch(t -> processInspecions.stream().filter(e -> e.getStatus().equals(1)).anyMatch(e -> e.getReturnReceiptDetailId().equals(t.getReturnReceiptDetailId())))) {
             flag = true;
             return success(flag);
         }
         return success(flag);
     }
+
     /**
      * 修改外协单主
-带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     * 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
      */
     @PreAuthorize("@ss.hasPermi('business:returnTurnover:edit')")
     @Log(title = "修改外协单，外协周转", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
-    public AjaxResult edit(@RequestBody BizOutsourcedOrderDetail outsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult edit(@RequestBody BizOutsourcedOrderDetail outsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
         //判断盘点
-        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
-        if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
+        if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
             return error("正在盘点，不能周转");
         }
         //判断箱子是否没被占用
@@ -251,38 +247,38 @@ public class BizReturnTurnoverController extends BaseController
         List<BizCarrier> blueCarrierList = carrierList.stream().filter(bizCarrier -> bizCarrier.getCategoryId().equals(2L)).collect(Collectors.toList());
         List<Long> blueCarrierIds = blueCarrierList.stream().map(BizCarrier::getId).collect(Collectors.toList());
         List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().in("carrier_id", blueCarrierIds.isEmpty() ? Collections.singletonList(0L) : blueCarrierList.stream().map(BizCarrier::getId).collect(Collectors.toList())).ne("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("is_changed", 0).list();
-        if(dayworkCarrierList.size()>0) {
+        if (dayworkCarrierList.size() > 0) {
             String alreadyUseCarrierList = dayworkCarrierList.stream().map(BizDayworkCarrier::getCarrierCode).collect(Collectors.joining(","));
-            return  error("载具"+alreadyUseCarrierList+"已被占用");
+            return error("载具" + alreadyUseCarrierList + "已被占用");
         }
         //判断箱子是否是同类型
         List<Long> collect = carrierList.stream().map(BizCarrier::getCategoryId).distinct().collect(Collectors.toList());
-        if(collect.size()>1) {
+        if (collect.size() > 1) {
             return error("箱子类型不一致");
         }
         //判断是否有多个铁箱子
         List<BizCarrier> ironCarrierList = carrierList.stream().filter(bizCarrier -> bizCarrier.getCategoryId().equals(1769620722266718210L)).collect(Collectors.toList());
-        if(ironCarrierList.size() >1) {
+        if (ironCarrierList.size() > 1) {
             return error("一个批次不能绑多个铁箱子");
         }
         //如果绑定铁箱子，判断该批次是否能绑定该铁箱（一个计划单能绑定同一个铁箱）
         if (ironCarrierList.size() == 1) {
             List<BizDayworkCarrier> iconDayworkCarrierList = bizDayworkCarrierService.query().ne("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("carrier_id", ironCarrierList.get(0).getId()).list();
-            if(iconDayworkCarrierList.size()>0) {
+            if (iconDayworkCarrierList.size() > 0) {
                 //铁箱子的报工
                 BizDaywork iconDaywork = bizDayworkService.query().eq("id", iconDayworkCarrierList.get(0).getDayworkId()).list().get(0);
                 //退回单的报工
                 BizDaywork returnDaywork = bizDayworkService.query().eq("id", outsourcedOrderDetail.getDayworkId()).list().get(0);
-                if(!iconDaywork.getProductionPlanDetailId().equals(returnDaywork.getProductionPlanDetailId())) {
+                if (!iconDaywork.getProductionPlanDetailId().equals(returnDaywork.getProductionPlanDetailId())) {
                     return error("计划单不同，不能绑定该铁箱");
                 }
 
             }
         }
         //下序分选包装审核
-        if(outsourcedOrderDetail.getIsSortPackaging() !=null && outsourcedOrderDetail.getIsSortPackaging()==1) {
+        if (outsourcedOrderDetail.getIsSortPackaging() != null && outsourcedOrderDetail.getIsSortPackaging() == 1) {
             List<BizDayworkItemExamine> dayworkItemExamineList = bizDayworkItemExamineService.query().eq("daywork_id", outsourcedOrderDetail.getDayworkId()).list();
-            if(!dayworkItemExamineList.isEmpty()){
+            if (!dayworkItemExamineList.isEmpty()) {
                 bizDayworkItemExamineService.removeBatchByIds(dayworkItemExamineList);
             }
             //新增
@@ -305,13 +301,15 @@ public class BizReturnTurnoverController extends BaseController
         //箱子判断完，修改收回单明细的箱号和周转工段
         bizOutsourcedOrderDetailService.updateById(outsourcedOrderDetail);
         //操作dayworkCarrier表，如果该批次已经绑箱，把对应箱解绑，并重新绑定新箱子
-        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("process_inspection_id", 0L).eq("is_changed",0).list();
-        if (returnDayworkCarrierList.size() > 0){
-            returnDayworkCarrierList.stream().forEach(bizDayworkCarrier -> {bizDayworkCarrier.setIsChanged(1);});
+        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().eq("daywork_id", outsourcedOrderDetail.getDayworkId()).eq("process_inspection_id", 0L).eq("is_changed", 0).list();
+        if (returnDayworkCarrierList.size() > 0) {
+            returnDayworkCarrierList.stream().forEach(bizDayworkCarrier -> {
+                bizDayworkCarrier.setIsChanged(1);
+            });
             bizDayworkCarrierService.updateBatchById(returnDayworkCarrierList);
         }
         List<BizDayworkCarrier> newDayworkCarrierList = new ArrayList<>();
-        for(BizCarrier bizCarrier : outsourcedOrderDetail.getCarriers()) {
+        for (BizCarrier bizCarrier : outsourcedOrderDetail.getCarriers()) {
             BizDayworkCarrier bizDayworkCarrier = new BizDayworkCarrier();
             bizDayworkCarrier.setCarrierId(bizCarrier.getId());
             bizDayworkCarrier.setCarrierCode(bizCarrier.getCode());
@@ -327,14 +325,14 @@ public class BizReturnTurnoverController extends BaseController
         //判断dayworkItem最新的一条状态，如果是7，则把这条删除，重新新增
         List<BizDayworkItem> dayworkItem = bizDayworkItemService.getListByDayworkIds(dayworkId);
         BizDayworkItem bizDayworkItem = dayworkItem.stream().sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).thenComparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0);
-        if("4".equals(bizDayworkItem.getStatus())){
+        if ("4".equals(bizDayworkItem.getStatus())) {
             bizDayworkItemService.removeById(bizDayworkItem);
         }
         BizDaywork bizDaywork = bizDayworkService.query().eq("id", outsourcedOrderDetail.getDayworkId()).list().get(0);
         //添加周转的一条dayworkItem
         BizDayworkItem newBizDayworkItem = new BizDayworkItem();
         //拿到周转到外协的最后一条数据
-        if(bizDaywork.getIsAmend() == 1){
+        if (bizDaywork.getIsAmend() == 1) {
             newBizDayworkItem.setFormDayworkItemId(1L);
         }
         newBizDayworkItem.setDayworkId(outsourcedOrderDetail.getDayworkId());
@@ -348,6 +346,7 @@ public class BizReturnTurnoverController extends BaseController
         newBizDayworkItem.setProcessId(lastDayworkItem.getProcessId());
         newBizDayworkItem.setDeptId(outsourcedOrderDetail.getProductionDeptId());
         newBizDayworkItem.setDeptName(outsourcedOrderDetail.getProductionDeptName());
+        newBizDayworkItem.setIsWx(1);
         newBizDayworkItem.setStatus("4");
         newBizDayworkItem.setNickName("外协");
         newBizDayworkItem.setStartTime(new Date());
@@ -369,13 +368,13 @@ public class BizReturnTurnoverController extends BaseController
             List<BizProductionResourceGroup> productionResourceGroupList = bizProductionResourceGroupService.list(new QueryWrapper<BizProductionResourceGroup>().eq("dept_id", outsourcedOrderDetail.getProductionDeptId()).eq("is_deactivate", 0));
 
             //查询是否已经分配资源组
-            BizProductionResourceGroupSubPlan groupSubPlan=new BizProductionResourceGroupSubPlan();
+            BizProductionResourceGroupSubPlan groupSubPlan = new BizProductionResourceGroupSubPlan();
             groupSubPlan.setDeptId(outsourcedOrderDetail.getProductionDeptId());
             groupSubPlan.setProductionPlanDetailId(lastDayworkItem.getProductionPlanDetailId());
 
             List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getAotList(groupSubPlan);
             //如果没分配
-            if(groupSubPlanList.size()==0){
+            if (groupSubPlanList.size() == 0) {
                 //查产品id
                 BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", bizDayworkItem.getProductionPlanDetailId()));
                 //存放保存的subPlanList
@@ -403,9 +402,9 @@ public class BizReturnTurnoverController extends BaseController
     @Transactional
     @PostMapping("/batchTurnover")
     public AjaxResult batchTurnover(@RequestBody BizOutsourcedOrderDetail outsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException {
-       //判断盘点
-        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
-        if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
+        //判断盘点
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status", 1).one();
+        if (bizTakeStockPeriod != null && bizTakeStockPeriod.getStatus() == 1) {
             return error("正在盘点，不能周转");
         }
         // 批量周转不换箱 则不需要判断是否箱被占用
@@ -418,39 +417,39 @@ public class BizReturnTurnoverController extends BaseController
         //操作dayworkCarrier表，如果该批次已经绑箱，把对应箱解绑，并重新绑定新箱子
         List<BizDayworkCarrier> newDayworkCarrierList = new ArrayList<>();
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.getListByDayworkIds(batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList()));
-        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).eq("process_inspection_id", 0L).eq("is_changed",0).list();
+        List<BizDayworkCarrier> returnDayworkCarrierList = bizDayworkCarrierService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).eq("process_inspection_id", 0L).eq("is_changed", 0).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).list();
 
-        if (returnDayworkCarrierList.size() > 0){
+        if (returnDayworkCarrierList.size() > 0) {
             returnDayworkCarrierList.stream().forEach(bizDayworkCarrier -> bizDayworkCarrier.setIsChanged(1));
         }
         //下序是否包装审核
-          if(outsourcedOrderDetail.getIsSortPackaging()!=null && outsourcedOrderDetail.getIsSortPackaging() == 1) {
-              List<BizDayworkItemExamine> dayworkItemExamineList = bizDayworkItemExamineService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).list();
-              if(!dayworkItemExamineList.isEmpty()){
-                  bizDayworkItemExamineService.removeBatchByIds(dayworkItemExamineList);
-              }
-              //新增包装前审核
-              List<BizDayworkItemExamine> addExamineList = new ArrayList<>();
-              for (BizOutsourcedOrderDetail item : batches) {
-                  BizDayworkItemExamine examine = new BizDayworkItemExamine();
-                  examine.setDayworkId(item.getDayworkId());
-                  examine.setDayworkItemId(item.getDayworkItemId());
-                  examine.setDeptId(item.getProductionDeptId());
-                  examine.setProductionPlanDetailId(item.getProductionPlanDetailId());
-                  examine.setProductDescription(item.getProductDescription());
-                  examine.setLotId(item.getLotId());
-                  examine.setLotCode(item.getLotCode());
-                  examine.setProductId(item.getProductId());
-                  examine.setTechnologicalProcessId(item.getTechnologicalProcessId());
-                  examine.setTechnologicalProcessDetailId(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getTechnologicalProcessDetailId());
-                  examine.setProcessId(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getProcessId());
-                  examine.setProcessAlias(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getProcessAlias());
-                  examine.setStatus(0);
-                  addExamineList.add(examine);
-              }
-              bizDayworkItemExamineService.saveBatch(addExamineList);
-          }
+        if (outsourcedOrderDetail.getIsSortPackaging() != null && outsourcedOrderDetail.getIsSortPackaging() == 1) {
+            List<BizDayworkItemExamine> dayworkItemExamineList = bizDayworkItemExamineService.query().in("daywork_id", batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getDayworkId).collect(Collectors.toList())).list();
+            if (!dayworkItemExamineList.isEmpty()) {
+                bizDayworkItemExamineService.removeBatchByIds(dayworkItemExamineList);
+            }
+            //新增包装前审核
+            List<BizDayworkItemExamine> addExamineList = new ArrayList<>();
+            for (BizOutsourcedOrderDetail item : batches) {
+                BizDayworkItemExamine examine = new BizDayworkItemExamine();
+                examine.setDayworkId(item.getDayworkId());
+                examine.setDayworkItemId(item.getDayworkItemId());
+                examine.setDeptId(item.getProductionDeptId());
+                examine.setProductionPlanDetailId(item.getProductionPlanDetailId());
+                examine.setProductDescription(item.getProductDescription());
+                examine.setLotId(item.getLotId());
+                examine.setLotCode(item.getLotCode());
+                examine.setProductId(item.getProductId());
+                examine.setTechnologicalProcessId(item.getTechnologicalProcessId());
+                examine.setTechnologicalProcessDetailId(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getTechnologicalProcessDetailId());
+                examine.setProcessId(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getProcessId());
+                examine.setProcessAlias(item.getFinishedProcesses().get(item.getFinishedProcesses().size() - 1).getProcessAlias());
+                examine.setStatus(0);
+                addExamineList.add(examine);
+            }
+            bizDayworkItemExamineService.saveBatch(addExamineList);
+        }
 
 
         // 自动派活
@@ -472,11 +471,11 @@ public class BizReturnTurnoverController extends BaseController
             });
             BizDaywork daywork = bizDayworks.stream().filter(v -> v.getId().equals(l.getDayworkId())).findFirst().orElse(null);
             BizDayworkItem lastDayworkItem = bizDayworkItems.stream().filter(v -> v.getDayworkId().equals(l.getDayworkId())).sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).reversed()).collect(Collectors.toList()).get(0);
-            if("4".equals(lastDayworkItem.getStatus())){
+            if ("4".equals(lastDayworkItem.getStatus())) {
                 removeItems.add(lastDayworkItem);
             }
             BizDayworkItem item = new BizDayworkItem();
-            if(daywork.getIsAmend() == 1){
+            if (daywork.getIsAmend() == 1) {
                 item.setFormDayworkItemId(1L);
             }
             item.setDayworkId(l.getDayworkId());
@@ -495,6 +494,7 @@ public class BizReturnTurnoverController extends BaseController
             item.setStartTime(new Date());
             item.setTurnoverType("2");
             item.setTurnoverArea("外协周转区");
+            item.setIsWx(1);
             item.setFromDeptId(lastDayworkItem.getDeptId());
             item.setFromDeptName(lastDayworkItem.getDeptName());
             addItems.add(item);
@@ -509,13 +509,13 @@ public class BizReturnTurnoverController extends BaseController
                 // 查资源组
 
                 //查询是否已经分配资源组
-                BizProductionResourceGroupSubPlan groupSubPlan=new BizProductionResourceGroupSubPlan();
+                BizProductionResourceGroupSubPlan groupSubPlan = new BizProductionResourceGroupSubPlan();
                 groupSubPlan.setDeptId(outsourcedOrderDetail.getProductionDeptId());
                 groupSubPlan.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
 
                 List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getAotList(groupSubPlan);
                 //如果没分配
-                if(groupSubPlanList.size()==0){
+                if (groupSubPlanList.size() == 0) {
                     //查产品id
                     BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", item.getProductionPlanDetailId()));
                     for (BizProductionResourceGroup info : productionResourceGroupList) {
@@ -555,16 +555,16 @@ public class BizReturnTurnoverController extends BaseController
         }
 
     }
+
     /**
      * 删除外协单主
-带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     * 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
      */
     @PreAuthorize("@ss.hasPermi('business:returnTurnover:remove')")
     @Log(title = "删除外协单", businessType = BusinessType.DELETE)
     @Transactional
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable List<Long> ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids) {
         bizReturnReceiptService.removeBatchByIds(ids);
         List<BizReturnReceiptDetail> bizReturnReceiptDetailList = bizReturnReceiptDetailService.query().in("master_id", ids).list();
         List<Long> bizReturnReceiptDetailIds = bizReturnReceiptDetailList.stream().map(BizReturnReceiptDetail::getId).collect(Collectors.toList());