root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-26 19:21:30 +08:00
parent a2f3c1f09d 447edb4470
commit 48f42dd3c4
29 changed files with 733 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
View File

@@ -62,12 +62,13 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
JSONObject customer_jo = WQLObject.getWQLObject("").query("cust_code = '"+customer_name+"'").uniqueResult(0);
JSONObject customer_jo = WQLObject.getWQLObject("md_cs_customerbase").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("cust_simple_name",company);
customer_jo.put("create_id",currentUserId);
customer_jo.put("create_name",nickName);
customer_jo.put("create_time",now);
@@ -77,6 +78,10 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
WQLObject.getWQLObject("md_cs_customerbase").insert(customer_jo);
}else {
customer_jo.put("cust_name",description);
customer_jo.put("cust_simple_name",company);
customer_jo.put("update_optid",currentUserId);
customer_jo.put("update_optname",nickName);
customer_jo.put("update_time",now);
WQLObject.getWQLObject("md_cs_customerbase").update(customer_jo);
}

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -891,6 +891,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String ContainerName = param.getString("ContainerName");
String SaleOrderName = param.getString("SaleOrderName");
String isUnPlanProduction = param.getString("isUnPlanProduction");
String sale_order_description = param.getString("Attribute1");
if (isUnPlanProduction.equals("1")){
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
@@ -903,6 +904,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
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);
sub_jo.put("sale_order_description",sale_order_description);
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);

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.