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

rev：生产入库回传修改、agv下发充电任务修改

Browse Source
This commit is contained in:
liuxy
2023-07-14 16:33:24 +08:00
parent 38b75b39aa
commit 02364658a5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
View File

@@ -337,12 +337,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String car_no = whereJson.getString("car_no"); String car_no = whereJson.getString("car_no");
JSONObject jsonParam = new JSONObject(); JSONObject jsonParam = new JSONObject();
if ("2,3".contains(car_no)) { if ("2,3,4,5".contains(car_no)) {
jsonParam.put("agv_system", "2"); jsonParam.put("agv_system", "2");
jsonParam.put("car_no", car_no); jsonParam.put("car_no", car_no);
} else if ("1".contains(car_no)) { } else if ("1".contains(car_no)) {
jsonParam.put("agv_system", "1"); jsonParam.put("agv_system", "1");
jsonParam.put("car_no", car_no); jsonParam.put("car_no", car_no);
} else if ("6,7,8,9".contains(car_no)) {
jsonParam.put("agv_system", "3");
jsonParam.put("car_no", car_no);
} }
try { try {

1
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -757,6 +757,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
} }
@Override @Override
@Transactional
public void upload(JSONObject whereJson) { public void upload(JSONObject whereJson) {
//出库分配表 //出库分配表
WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");