From a1c7893ad33de11c7325eacda5b9f6a69a891f3e Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 11 Jun 2025 13:56:04 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9Aerp=E4=B8=8B=E5=8F=91=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BsrealStorattrServiceImpl.java | 2 +- .../nl/wms/ext/service/ErpToWmsService.java | 14 +-- .../ext/service/impl/ErpToWmsServiceImpl.java | 87 +++++++++++++++++++ .../service/impl/OutBillServiceImpl.java | 22 +---- .../src/main/resources/log/ErpToWms.xml | 6 +- .../src/main/resources/log/SendAcsTask.xml | 6 +- .../src/main/resources/logback-spring.xml | 1 + wms/nladmin-ui/README.md | 2 +- wms/nladmin-ui/src/i18n/langs/zh-CN.js | 2 +- .../src/layout/components/Sidebar/Logo.vue | 2 +- 10 files changed, 110 insertions(+), 34 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java index 31db1be..4fcf024 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/BsrealStorattrServiceImpl.java @@ -90,7 +90,7 @@ public class BsrealStorattrServiceImpl extends ServiceImpl * ERP调用WMS 实现类 @@ -20,12 +35,36 @@ import org.springframework.stereotype.Service; @Slf4j public class ErpToWmsServiceImpl implements ErpToWmsService { + /** + * 仓库实物表服务 + */ + @Autowired + private IBsrealStorattrService iBsrealStorattrService; + + /** + * 物料基础数据服务 + */ + @Autowired + private IMdMeMaterialbaseService iMdMeMaterialbaseService; + + /** + * 计量单位服务 + */ + @Autowired + private IMdPbMeasureunitService iMdPbMeasureunitService; + /** * 载具扩展属性mapper */ @Autowired private MdPbStoragevehicleextMapper mdPbStoragevehicleextMapper; + /** + * 出库服务 + */ + @Autowired + private IOutBillService iOutBillService; + @Override public ErpResponse erpQueryIvt(JSONObject whereJson) { log.info("erpQueryIvt查询物料接口输入参数为：-------------------" + whereJson.toString()); @@ -37,7 +76,55 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { @Override public ErpResponse sendTask(JSONObject whereJson) { log.info("sendTask下发出库任务接口输入参数为：-------------------" + whereJson.toString()); + // 组织主表数据 + JSONObject jsonMst = new JSONObject(); + jsonMst.put("biz_date", DateUtil.now()); + jsonMst.put("bill_status", IOSEnum.BILL_STATUS.code("生成")); + jsonMst.put("source_id", whereJson.getString("inv_code")); + jsonMst.put("source_type", whereJson.getString("task_type")); + jsonMst.put("bill_type", whereJson.getString("task_type")); + jsonMst.put("user","erp"); + // 查询仓库 + BsrealStorattr storDao = iBsrealStorattrService.findByCode(whereJson.getString("stor_code")); + jsonMst.put("stor_id", storDao.getStor_id()); + // 组织明细 + List dataList = whereJson.getJSONArray("data").toJavaList(JSONObject.class); + // 查询所有物料 + List materDaoList = iMdMeMaterialbaseService.list( + new QueryWrapper().lambda() + .in(MdMeMaterialbase::getMaterial_code, dataList.stream() + .map(row -> row.getString("mater_code")) + .collect(Collectors.toList()) + ) + ); + // 查询所有计量单位 + List unitDaoList = iMdPbMeasureunitService.list( + new QueryWrapper().lambda() + .in(MdPbMeasureunit::getUnit_code, dataList.stream() + .map(row -> row.getString("unit_code")) + .collect(Collectors.toList())) + ); + // 明细集合 + JSONArray dtlArr = new JSONArray(); + for (JSONObject json : dataList) { + JSONObject jsonDtl = new JSONObject(); + MdMeMaterialbase materDao = materDaoList.stream() + .filter(row -> row.getMaterial_code().equals(json.getString("mater_code"))) + .findFirst().orElse(null); + jsonDtl.put("material_id", materDao.getMaterial_id()); + jsonDtl.put("pcsn", json.getString("batch_no")); + MdPbMeasureunit unitDao = unitDaoList.stream() + .filter(row -> row.getUnit_code().equals(json.getString("unit_code"))) + .findFirst().orElse(null); + jsonDtl.put("qty_unit_id", unitDao.getMeasure_unit_id()); + jsonDtl.put("qty_unit_name", unitDao.getUnit_name()); + jsonDtl.put("qty", json.getString("quantity")); + dtlArr.add(jsonDtl); + } + jsonMst.put("tableData",dtlArr); + // 调用出库单新增服务 + iOutBillService.insertDtl(jsonMst); log.info("sendTask下发出库任务接口输出参数为：-------------------" + ErpResponse.requestOk().toString()); return ErpResponse.requestOk(); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java index ec8472f..e54504d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java @@ -165,11 +165,6 @@ public class OutBillServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public String insertDtl(JSONObject map) { -// if(MapUtil.getStr(map,"bill_type").equals("1011")) { -// String iostorinv_id = inserdtlPic(map); -// return iostorinv_id ; -// } - //明细 JSONArray array = map.getJSONArray("tableData"); @@ -178,13 +173,9 @@ public class OutBillServiceImpl extends ServiceImpl i String nickName = SecurityUtils.getCurrentNickName(); String user = map.getString("user"); if (ObjectUtil.isNotEmpty(user)) { - if ("mes".equals(user)) { + if ("erp".equals(user)) { currentUserId = "2"; - nickName = "mes用户"; - } - if ("sap".equals(user)) { - currentUserId = "3"; - nickName = "sap用户"; + nickName = "ERP用户"; } } String now = DateUtil.now(); @@ -210,13 +201,6 @@ public class OutBillServiceImpl extends ServiceImpl i map.put("update_time", now); map.put("is_delete", BaseDataEnum.IS_YES_NOT.code("否")); map.put("is_upload", BaseDataEnum.IS_YES_NOT.code("否")); - if (ObjectUtil.isNotEmpty(user)) { - if (!"mes".equals(user) || "sap".equals(user)) { - Long deptId = SecurityUtils.getDeptId(); - map.put("sysdeptid", deptId); - map.put("syscompanyid", deptId); - } - } // 主表重量 double qty = 0.0; // 明细数 @@ -305,7 +289,7 @@ public class OutBillServiceImpl extends ServiceImpl i // 根据物料和批次号查询库存可用 BigDecimal canuseSum = mdPbStoragevehicleextMapper.queryCanuseSum(pcsn,material_id); - if (canuseSum.doubleValue() - + - ${LOG_HOME}/SendAcsTask/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/ErpToWms/%d{yyyy-MM-dd}.%i.log 15 @@ -23,6 +23,6 @@ - + diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml b/wms/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml index caf210d..9d97a99 100644 --- a/wms/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml +++ b/wms/nladmin-system/nlsso-server/src/main/resources/log/SendAcsTask.xml @@ -3,10 +3,10 @@ - + - ${LOG_HOME}/ErpToWms/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/SendAcsTask/%d{yyyy-MM-dd}.%i.log 15 @@ -23,6 +23,6 @@ - + diff --git a/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index b7198a8..f51170f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/wms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -17,6 +17,7 @@ https://juejin.cn/post/6844903775631572999 + diff --git a/wms/nladmin-ui/README.md b/wms/nladmin-ui/README.md index 91585ff..2d75b9e 100644 --- a/wms/nladmin-ui/README.md +++ b/wms/nladmin-ui/README.md @@ -1,3 +1,3 @@ -# 新生北安系统 +# 北安新生WMS系统 /api/sysMenu/build?systemType=1 \ No newline at end of file diff --git a/wms/nladmin-ui/src/i18n/langs/zh-CN.js b/wms/nladmin-ui/src/i18n/langs/zh-CN.js index 540ae60..27c72fe 100644 --- a/wms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/wms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -2,7 +2,7 @@ export default { 'lang': 'zh', // 平台 'platform': { - 'title': '新生北安系统', + 'title': '北安新生WMS系统', 'tip1': '用户名不能为空', 'tip2': '密码不能为空', 'tip3': '验证码不能为空' diff --git a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index 96979ca..f9d69b6 100644 --- a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - title: '新生北安系统', + title: '北安新生WMS系统', logo: Logo, title_param: 'platform' }