Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -152,7 +152,7 @@ public class SysWorkplaceQueueController extends BaseController {
     @PostMapping("/udiwms/sysWorkplaceQueue/delete")
     public BaseResponse deleteById(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
         //删除
-        sysWorkplaceQueueService.removeById(sysWorkplaceQueue);
+        sysWorkplaceQueueService.removeQueue(sysWorkplaceQueue);
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.basic.SysWorkplaceFreight;
 import com.glxp.api.entity.basic.SysWorkplaceLayer;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
@@ -31,6 +32,12 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     @Resource
     private SysWorkplaceQueueMapper sysWorkplaceQueueMapper;
 
+    @Resource
+    SysWorkplaceLayerService sysWorkplaceLayerService;
+
+    @Resource
+    SysWorkplaceFreightService sysWorkplaceFreightService;
+
 
     public String createQueueCode() {
         String code;
@@ -198,4 +205,15 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     public SysWorkplaceQueue getByCode(String code) {
         return getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, code).last("limit 1"));
     }
+
+    public void removeQueue(SysWorkplaceQueue sysWorkplaceQueue) {
+        SysWorkplaceQueue byId = getById(sysWorkplaceQueue);
+        if (byId == null){
+            throw new JsonException(500,"当前槽位不存在");
+        }
+        SysWorkplaceLayer one = sysWorkplaceLayerService.getOne(new LambdaQueryWrapper<SysWorkplaceLayer>().eq(SysWorkplaceLayer::getCode, byId.getLayerCode()));
+        one.setQueueNum(one.getQueueNum() - 1);
+        sysWorkplaceLayerService.updateById(one);
+        removeById(byId);
+    }
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -448,22 +448,53 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     }
 
 
-    public List<CollectOrderBizResponse>  setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
+//    public List<CollectOrderBizResponse>  setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
+//        List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
+//        List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
+//        List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
+//        for (CollectOrderBizResponse collectOrderBiz : list) {
+//            CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
+//            BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
+//            //查询手动赋码的code
+//            for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
+//                UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
+//                if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
+//                    collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
+//                }
+//            }
+//            if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){
+//                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
+//            }
+//            collectOrderBizResponses.add(collectOrderBizResponse);
+//        }
+//
+//        return collectOrderBizResponses;
+//    }
+
+    public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
         List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
-        List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
+        List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());
         List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
+        Map<String, UdiRelevanceResponse> udiRelevanceMap = new HashMap<>();
+
+        for (CollectOrderBizResponse collectOrderBiz : list) {
+            udiRelevanceMap.put(collectOrderBiz.getNameCode(), udiRelevanceService.selectByNameCode(collectOrderBiz.getNameCode()));
+        }
+
         for (CollectOrderBizResponse collectOrderBiz : list) {
             CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
             BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
-            //查询手动赋码的code
+
-            for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceMap.get(collectOrderBizResponse.getNameCode());
-                UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
+            if (udiRelevanceResponse != null) {
-                if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
+                for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
-                    collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
+                    if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
+                        collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
+                    }
+                }
+                if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){
+                    collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
                 }
-            }
-            if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
             }
             collectOrderBizResponses.add(collectOrderBizResponse);
         }