root/rongLiJiaNai
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/rongLiJiaNai

Browse Source
This commit is contained in:
loujf
2022-10-13 07:57:06 +08:00
parent 13ed468b00 d74c2c4f24
commit 936f7195f0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
View File

@@ -219,11 +219,10 @@ IF 输入.flag = "6"
AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL ) AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL )
AND task.task_code IS NULL AND task.task_code IS NULL
AND point.point_status = '00' AND point.point_status = '00'
and point.material_code<>'0'
OPTION 输入.material_type <> "" OPTION 输入.material_type <> ""
point.material_type = 输入.material_type point.material_type = 输入.material_type
ENDOPTION ENDOPTION
OPTION 输入.material_code <> "" OPTION point.material_code <> "0"
point.material_code = 输入.material_code point.material_code = 输入.material_code
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT

8
wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
View File

@@ -299,15 +299,17 @@ public class ProducetaskServiceImpl implements ProducetaskService {
} else { } else {
taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0); taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
} }
taskObj.put("product_type", "wms"); taskObj.put("product_type", "wms");
WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class); WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
JSONArray arr = new JSONArray(); JSONArray arr = new JSONArray();
arr.add(taskObj); arr.add(taskObj);
wmsToAcsService.sendProduceTask(arr); wmsToAcsService.sendProduceTask(arr);
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("producetask_status", "02"); String producetask_status = "02";
if (StrUtil.equals(device_id, "1560189462410039296")) {
producetask_status = "04";
}
map.put("producetask_status", producetask_status);
map.put("update_optid", currentUserId); map.put("update_optid", currentUserId);
map.put("update_optname", nickName); map.put("update_optname", nickName);
map.put("update_time", now); map.put("update_time", now);