From c1caf24ad7d19746c21a39595dbb236e62a9fbc8 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 24 Nov 2022 16:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/basedata/master/wql/mdcs.xls | Bin 177664 -> 180736 bytes .../crm/service/impl/CrmToLmsServiceImpl.java | 27 +++ .../mes/service/impl/MesToLmsServiceImpl.java | 24 +++ .../sap/service/impl/LmsToSapServiceImpl.java | 8 +- .../impl/SubpackagerelationServiceImpl.java | 2 + .../nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql | 5 + .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 281600 -> 248320 bytes lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 24 ++- .../wms/pdm/order/slittingplan/index.vue | 204 ++++++++++++------ 9 files changed, 215 insertions(+), 79 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls index 794977a9589d31b9d03fee256ba39befb07f0ffa..6d0b2feebcfe2867d24ebd5deef8a2e8fe160ba5 100644 GIT binary patch delta 16609 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 delta 14075 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java index 5cbc290c8..154136bac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java @@ -1,11 +1,14 @@ package org.nl.wms.ext.crm.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.wms.ext.crm.service.CrmToLmsService; import org.nl.modules.wql.core.bean.WQLObject; @@ -54,6 +57,30 @@ public class CrmToLmsServiceImpl implements CrmToLmsService { WQLObject.getWQLObject("MD_CS_CustomerBaseProc").insert(jo); log.info(jo.toString()); + //插入客户表 + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONObject customer_jo = WQLObject.getWQLObject("").query("cust_code = '"+customer_name+"'").uniqueResult(0); + if (ObjectUtil.isEmpty(customer_jo)){ + customer_jo = new JSONObject(); + customer_jo.put("cust_id",IdUtil.getSnowflake(1,1).nextId()); + customer_jo.put("cust_code",customer_name); + customer_jo.put("cust_name",description); + customer_jo.put("create_id",currentUserId); + customer_jo.put("create_name",nickName); + customer_jo.put("create_time",now); + customer_jo.put("update_optid",currentUserId); + customer_jo.put("update_optname",nickName); + customer_jo.put("update_time",now); + WQLObject.getWQLObject("md_cs_customerbase").insert(customer_jo); + }else { + customer_jo.put("cust_name",description); + WQLObject.getWQLObject("md_cs_customerbase").update(customer_jo); + } + + JSONObject result = new JSONObject(); result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index cd5793af9..0581627f1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -882,7 +882,31 @@ public class MesToLmsServiceImpl implements MesToLmsService { String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue(); if (StrUtil.equals(is_mesTolms, "1")) { + String ContainerName = param.getString("ContainerName"); + String SaleOrderName = param.getString("SaleOrderName"); + String isUnPlanProduction = param.getString("isUnPlanProduction"); + if (isUnPlanProduction.equals("1")){ + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '"+ContainerName+"'").uniqueResult(0); + /*sub_jo.put("change_type_scode","02"); + sub_jo.put("create_id",currentUserId); + sub_jo.put("create_name",nickName); + sub_jo.put("change_time",DateUtil.now()); + sub_jo.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + ""); + WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(sub_jo);*/ + sub_jo.put("sale_order_name",SaleOrderName); + WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_jo); + + /*JSONObject new_sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '"+ContainerName+"' AND status = '2'").uniqueResult(0); + new_sub.put("change_type_scode","01"); + new_sub.put("create_id",currentUserId); + new_sub.put("create_name",nickName); + new_sub.put("change_time",DateUtil.now()); + new_sub.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + ""); + WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(new_sub);*/ + } } JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java index 73b3a73c0..5e775b475 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java @@ -54,7 +54,8 @@ public class LmsToSapServiceImpl implements LmsToSapService { String api = ""; url = url + "/sap/center/wms/004"; try { - String resultMsg = HttpRequest.post(url).header("TOKEN","FA163EE139D41EED9286BB7E1A2F8D4C") + String resultMsg = HttpRequest.post(url).header("TOKEN","877734686FA61EDD99E9D85A96D91E14") + .header("sap-client","800") .body(String.valueOf(jo)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -115,10 +116,11 @@ public class LmsToSapServiceImpl implements LmsToSapService { // String url = acsUrl + api; String url = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SAP_URL").getValue(); - String api = ""; + String api = "/sap/center/wms/005"; url = url + api; try { - String resultMsg = HttpRequest.post(url) + String resultMsg = HttpRequest.post(url).header("TOKEN","877734686FA61EDD99E9D85A96D91E14") + .header("sap-client","800") .body(String.valueOf(jo)) .execute().body(); result = JSONObject.parseObject(resultMsg); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java index 513620aa5..e25c12a09 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java @@ -44,10 +44,12 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); String customer_name = MapUtil.getStr(whereJson, "customer_name"); String customer_description = MapUtil.getStr(whereJson, "customer_description"); + String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); JSONObject map = new JSONObject(); map.put("flag", "1"); if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); + if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); if (ObjectUtil.isNotEmpty(material_name)) map.put("material_name","%"+material_name+"%"); if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%"); if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql index f017a9061..dd04765ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql @@ -19,6 +19,7 @@ 输入.sale_order_name TYPEAS s_string 输入.customer_name TYPEAS s_string 输入.customer_description TYPEAS s_string + 输入.package_box_sn TYPEAS s_string [临时表] @@ -55,6 +56,10 @@ product_name LIKE 输入.material_code ENDOPTION + OPTION 输入.package_box_sn <> "" + package_box_sn LIKE 输入.package_box_sn + ENDOPTION + OPTION 输入.material_name <> "" product_description LIKE 输入.material_name ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index fb101b29b9e791e8cc30843c1a8e046645df8032..843466d77d618556f458b9a3b7cb195b18be3e4b 100644 GIT binary patch delta 12497 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 delta 42106 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

-dVv#1 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 Tfq$t1HTC~eBh>W=)Y|_C6uAPY diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 7f6715d91..b541f1c15 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -31,6 +31,16 @@ @keyup.enter.native="crud.toQuery" /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262,7 +328,7 @@ - +