opt:混托物料组盘修改

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java

@@ -153,11 +153,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 handleFinishTask(param, task);
                 return;
             }
-            MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
+            List<MdPbVehicleMater> vehicleMaterList = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
                     .eq("vehicle_code", task.getVehicle_code())
                     .eq("is_delete", false));
-            if (vehicleMater != null && !StringUtils.isEmpty(vehicleMater.getProc_inst_id())) {
-                FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null);
+            if (ObjectUtil.isEmpty(vehicleMaterList)) {
+                throw new BadRequestException("任务完成失败，到载具物料信息: " + task.getVehicle_code());
+            }
+            if (StringUtils.isNotBlank(vehicleMaterList.get(0).getProc_inst_id())) {
+                FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null);
                 BussEventMulticaster.Publish(continueEvent);
             } else {
                 handleFinishTask(param, task);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java

@@ -312,7 +312,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
                     vehicleMater.setMaterial_id(materialCode.getMaterial_id());
                     vehicleMater.setId(IdUtil.getStringId());
                     vehicleMater.setUnit_id("100438");//个
-                    vehicleMater.setStor_code("FStockId");
+                    vehicleMater.setStor_code(vehicle_code.toUpperCase().contains("T")?"FStockPallet":"FStockId");
                     vehicleMater.setCreate_time(now);
                     vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
                     groups.add(dick);