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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-30 10:16:46 +08:00
parent c90eebe10a
commit a34bb6cb9e
3 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,16 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
map.put("width", width); map.put("width", width);
} }
if (StrUtil.isNotEmpty(packageboxsn)) { if (StrUtil.isNotEmpty(packageboxsn)) {
map.put("packageboxsn", packageboxsn); String[] split = packageboxsn.split(",");
String ids = "('";
for (int i = 0; i < split.length; i++) {
if (i == split.length - 1 || split.length == 1) {
ids += split[i] + "')";
} else {
ids += split[i] + "','";
}
}
map.put("packageboxsn", ids);
} }
if (StrUtil.isNotEmpty(dateoffginbound)) { if (StrUtil.isNotEmpty(dateoffginbound)) {
map.put("dateoffginbound", dateoffginbound); map.put("dateoffginbound", dateoffginbound);
@@ -152,10 +161,28 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
map.put("warehouse_code", warehouse_code); map.put("warehouse_code", warehouse_code);
} }
if (StrUtil.isNotEmpty(container_name)) { if (StrUtil.isNotEmpty(container_name)) {
map.put("container_name", container_name); String[] split = container_name.split(",");
String ids = "('";
for (int i = 0; i < split.length; i++) {
if (i == split.length - 1 || split.length == 1) {
ids += split[i] + "')";
} else {
ids += split[i] + "','";
}
}
map.put("container_name", ids);
} }
if (StrUtil.isNotEmpty(pcsn)) { if (StrUtil.isNotEmpty(pcsn)) {
map.put("sap_pcsn", pcsn); String[] split = pcsn.split(",");
String ids = "('";
for (int i = 0; i < split.length; i++) {
if (i == split.length - 1 || split.length == 1) {
ids += split[i] + "')";
} else {
ids += split[i] + "','";
}
}
map.put("sap_pcsn", ids);
} }
if (StrUtil.isNotEmpty(width_standard)) { if (StrUtil.isNotEmpty(width_standard)) {
map.put("width_standard", width_standard); map.put("width_standard", width_standard);

99
lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
View File

@@ -18,12 +18,12 @@
输入.material_name TYPEAS s_string 输入.material_name TYPEAS s_string
输入.mfgordername TYPEAS f_string 输入.mfgordername TYPEAS f_string
输入.customername TYPEAS s_string 输入.customername TYPEAS s_string
输入.packageboxsn TYPEAS s_string 输入.packageboxsn TYPEAS f_string
输入.dateoffginbound TYPEAS s_string 输入.dateoffginbound TYPEAS s_string
输入.warehouse_code TYPEAS s_string 输入.warehouse_code TYPEAS s_string
输入.customerdescription TYPEAS s_string 输入.customerdescription TYPEAS s_string
输入.sap_pcsn TYPEAS s_string 输入.sap_pcsn TYPEAS f_string
输入.container_name TYPEAS s_string 输入.container_name TYPEAS f_string
输入.thickness TYPEAS s_string 输入.thickness TYPEAS s_string
输入.thickness_request TYPEAS s_string 输入.thickness_request TYPEAS s_string
输入.width TYPEAS f_string 输入.width TYPEAS f_string
@@ -78,49 +78,56 @@
INNER JOIN st_ivt_structattr sa On sa.storagevehicle_code = sub.package_box_sn INNER JOIN st_ivt_structattr sa On sa.storagevehicle_code = sub.package_box_sn
INNER JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = sa.stor_id INNER JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = sa.stor_id
WHERE WHERE
sub.`status` = '2' sub.package_box_sn IN (
OPTION 输入.material_code <> "" SELECT DISTINCT
product_name = 输入.material_code package_box_sn
ENDOPTION FROM
OPTION 输入.material_name <> "" pdm_bi_subpackagerelation sub
product_description = 输入.material_name WHERE
ENDOPTION sub.`status` = '2'
OPTION 输入.mfgordername <> "" OPTION 输入.material_code <> ""
SUBSTRING_INDEX(sale_order_name, "-", 1) IN 输入.mfgordername product_name = 输入.material_code
ENDOPTION ENDOPTION
OPTION 输入.customername <> "" OPTION 输入.material_name <> ""
customer_name = 输入.customername product_description = 输入.material_name
ENDOPTION ENDOPTION
OPTION 输入.customerdescription <> "" OPTION 输入.mfgordername <> ""
customer_description = 输入.customerdescription SUBSTRING_INDEX(sale_order_name, "-", 1) IN 输入.mfgordername
ENDOPTION ENDOPTION
OPTION 输入.width <> "" OPTION 输入.customername <> ""
sub.width >= 输入.width customer_name = 输入.customername
ENDOPTION ENDOPTION
OPTION 输入.warehouse_code <> "" OPTION 输入.customerdescription <> ""
stor.ext_id = 输入.warehouse_code customer_description = 输入.customerdescription
ENDOPTION ENDOPTION
OPTION 输入.dateoffginbound <> "" OPTION 输入.width <> ""
sub.date_of_FG_inbound = 输入.dateoffginbound sub.width >= 输入.width
ENDOPTION ENDOPTION
OPTION 输入.packageboxsn <> "" OPTION 输入.dateoffginbound <> ""
sub.package_box_sn = 输入.packageboxsn sub.date_of_FG_inbound = 输入.dateoffginbound
ENDOPTION ENDOPTION
OPTION 输入.container_name <> "" OPTION 输入.packageboxsn <> ""
sub.container_name = 输入.container_name sub.package_box_sn IN 输入.packageboxsn
ENDOPTION ENDOPTION
OPTION 输入.sap_pcsn <> "" OPTION 输入.container_name <> ""
sub.sap_pcsn = 输入.sap_pcsn sub.container_name IN 输入.container_name
ENDOPTION ENDOPTION
OPTION 输入.width_standard <> "" OPTION 输入.sap_pcsn <> ""
sub.width_standard >= 输入.width_standard sub.sap_pcsn IN 输入.sap_pcsn
ENDOPTION ENDOPTION
OPTION 输入.thickness <> "" OPTION 输入.width_standard <> ""
sub.thickness = 输入.thickness sub.width_standard >= 输入.width_standard
ENDOPTION ENDOPTION
OPTION 输入.thickness_request <> "" OPTION 输入.thickness <> ""
sub.thickness_request = 输入.thickness_request sub.thickness = 输入.thickness
ENDOPTION ENDOPTION
OPTION 输入.thickness_request <> ""
sub.thickness_request = 输入.thickness_request
ENDOPTION
)
OPTION 输入.warehouse_code <> ""
stor.ext_id = 输入.warehouse_code
ENDOPTION
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -53,6 +53,7 @@ public class OutTask extends AbstractAcsTask {
// 1.查询此任务是否有任务组 // 1.查询此任务是否有任务组
if (ObjectUtil.isEmpty(json.getString("task_group_id"))) { if (ObjectUtil.isEmpty(json.getString("task_group_id"))) {
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code")) .task_code(json.getString("task_code"))
@@ -61,6 +62,7 @@ public class OutTask extends AbstractAcsTask {
.next_device_code(json.getString("point_code2")) .next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code")) .vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority")) .priority(json.getString("priority"))
.dtl_type(String.valueOf(dtl_type))
.remark(json.getString("remark")) .remark(json.getString("remark"))
.build(); .build();
resultList.add(dto); resultList.add(dto);
@@ -71,6 +73,8 @@ public class OutTask extends AbstractAcsTask {
for (int j = 0; j < taskArr.size(); j++) { for (int j = 0; j < taskArr.size(); j++) {
JSONObject json2 = taskArr.getJSONObject(j); JSONObject json2 = taskArr.getJSONObject(j);
char dtl_type = json2.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json2.getString("task_id")) .ext_task_id(json2.getString("task_id"))
.task_code(json2.getString("task_code")) .task_code(json2.getString("task_code"))
@@ -79,6 +83,7 @@ public class OutTask extends AbstractAcsTask {
.next_device_code(json2.getString("point_code2")) .next_device_code(json2.getString("point_code2"))
.vehicle_code(json2.getString("vehicle_code")) .vehicle_code(json2.getString("vehicle_code"))
.priority(json2.getString("priority")) .priority(json2.getString("priority"))
.dtl_type(String.valueOf(dtl_type))
.remark(json2.getString("remark")) .remark(json2.getString("remark"))
.build(); .build();
resultList.add(dto); resultList.add(dto);
@@ -172,6 +177,7 @@ public class OutTask extends AbstractAcsTask {
json.put("create_id", currentUserId); json.put("create_id", currentUserId);
json.put("create_name", currentUsername); json.put("create_name", currentUsername);
json.put("create_time", DateUtil.now()); json.put("create_time", DateUtil.now());
json.put("acs_task_type", "7");
WQLObject.getWQLObject("SCH_BASE_Task").insert(json); WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
return json.getString("task_id"); return json.getString("task_id");