diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/HeartClientServer.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/HeartClientServer.java index 231a64f8..c19ecdc2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/HeartClientServer.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/HeartClientServer.java @@ -98,7 +98,7 @@ public class HeartClientServer extends AbstraceServer { executor.submit(()->{ while (channel!=null && channel.isActive()){ try { - Thread.sleep(3000); + Thread.sleep(1500); ByteBuf log = Unpooled.copiedBuffer("ping--222-", CharsetUtil.UTF_8); if (channel==null){ return; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/RunClientHeartMain.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/RunClientHeartMain.java index aac10d5f..d558eda7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/RunClientHeartMain.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/websocket/heartSocket/clientSocket/RunClientHeartMain.java @@ -15,6 +15,6 @@ import java.nio.charset.StandardCharsets; */ public class RunClientHeartMain { public static void main(String[] args) throws InterruptedException { - HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.10.60", 20889)); +// HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.10.60", 20889)); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java index 80639efd..87b77032 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java @@ -128,7 +128,7 @@ public class BmFormStrucController { //参数判读，参数解析，调用参数入库 QueryWrapper queryWrapper = new QueryWrapper().select("form_type", "form_name").isNull("parent_id").groupBy("form_type"); if (StringUtils.isNotEmpty(desc)){ - queryWrapper.eq("form_desc",desc); + queryWrapper.like("form_desc",desc); } List> select = iBmFormStrucService.listMaps(queryWrapper); List list = new ArrayList<>(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java index 3e97edb6..6c66de9a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java @@ -80,10 +80,10 @@ public class PdaOutController { @Log("查询单据数据") @SaIgnore public ResponseEntity> orderConfirm(@RequestBody JSONObject param) { - if (param==null || StringUtils.isEmpty(param.getString("code"))){ + if (param==null || StringUtils.isEmpty(param.getString("code"))||StringUtils.isEmpty(param.getString("stor_code"))){ throw new BadRequestException("请求参数不能为空"); } - PmFormDataDto pmFormDataDto = iPmFormDataService.queryErpCode(param.getString("code")); + PmFormDataDto pmFormDataDto = iPmFormDataService.queryErpCode(param.getString("code"),param.getString("stor_code")); return new ResponseEntity<>(TableDataInfo.build(ListOf.of(pmFormDataDto)), HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java index 8a1999c6..e6a8e69a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java @@ -137,7 +137,7 @@ public class PdaIOService { HashMap map = MapOf.of("end_struct_code", "", "start_struct_code", "", "order", "", "product_area", productArea); ivtDtl.setForm_data(new JSONObject(map)); ivtDtl.setQty(now_assign_qty); - ivtDtl.setPcsn(pdaFormOutMst.getPcsn()); + ivtDtl.setPcsn(dtl.getPcsn()); ivtDtl.setStor_code(storCode);//pdaFormOutMst.getStor_code() ivtDtl.setId(IdUtil.getStringId()); ivtDtl.setInv_id(mst.getId()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java index 27679032..f7e134cd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java @@ -42,7 +42,7 @@ public interface IPmFormDataService extends IService { * @param code * @return */ - PmFormDataDto queryErpCode(String code); + PmFormDataDto queryErpCode(String code,String stor_code); /** * 一对多同步改成一对一同步 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index ece10cc4..3f4a51c6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -191,10 +191,12 @@ public class PmFormDataServiceImpl extends ServiceImpl> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id)); for (PmFormDataDto dataDto : pmFormDataDtos) { + String productArea = dataDto.getForm_data().getString("product_area"); + dataDto.setProduct_area(productArea); List children = childMap.get(dataDto.getId()); for (PmFormDataDto child : children) { - String productArea = child.getForm_data().getString("product_area"); - child.setProduct_area(productArea); + String childProductArea = child.getForm_data().getString("product_area"); + child.setProduct_area(childProductArea); } dataDto.setChildren(children); } @@ -206,7 +208,7 @@ public class PmFormDataServiceImpl extends ServiceImpl collect = childs.stream().map(PmFormDataDto::getMaterial_id).collect(Collectors.toList()); //TODO:指定仓库 - List structMaterials = iStIvtStructattrService.getStructIvtAssign(collect, "FStockId"); + List structMaterials = iStIvtStructattrService.getStructIvtAssign(collect, stor_code); Map> materialMap = structMaterials.stream().collect(Collectors.groupingBy(StructAssignQty::getMaterial_id)); - for (PmFormDataDto child : childs) { - String productArea = child.getForm_data().getString("product_area"); - child.setProduct_area(productArea); + String childProductArea = child.getForm_data().getString("product_area"); + child.setProduct_area(childProductArea); List maps = materialMap.get(child.getMaterial_id()); if (CollectionUtils.isEmpty(maps)){ child.setSto_qty(new BigDecimal(0)); diff --git a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue index 8a371c74..fc06ae14 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue @@ -6,7 +6,7 @@