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

代码更新

Browse Source
This commit is contained in:
ludj
2023-10-24 17:50:25 +08:00
parent 161d9116ea
commit 98e2b430bf
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
View File

@@ -575,6 +575,12 @@ public class WmsToJnServiceImpl implements WmsToJnService {
Date date = DateUtil.date(); Date date = DateUtil.date();
//产品入库批次号(唯一) //产品入库批次号(唯一)
String pc = DateUtil.format(date, "yyyyMMddHHmmss"); String pc = DateUtil.format(date, "yyyyMMddHHmmss");
if (ObjectUtil.isEmpty(mstObj)){
mstObj=new JSONObject();
mstObj.put("pro_stockno",vehicle_code);
mstObj.put("itemcode",(String) whereJson.get("material_code"));
}
mstObj.put("PC",pc); mstObj.put("PC",pc);
mstObj.put("RECORD_TIME",DateUtil.now()); mstObj.put("RECORD_TIME",DateUtil.now());

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java
View File

@@ -110,10 +110,14 @@ public class ToPackIngTask extends AbstractAcsTask {
recordTab.update(record1); recordTab.update(record1);
} }
String material_code="";
if (ObjectUtil.isNotEmpty(jsonTask.getJSONObject("request_param"))){
material_code = jsonTask.getJSONObject("request_param").getString("material_code");
}
// 调用mes接口 // 调用mes接口
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("vehicle_code", jsonTask.getString("vehicle_code")); map.put("vehicle_code", jsonTask.getString("vehicle_code"));
map.put("material_code", material_code);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackPackage(map); wmsToJnServiceImpl.feedBackPackage(map);

5
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoFeedBackInfo.java
View File

@@ -7,14 +7,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wql.core.bean.WQLObject; import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.lang.reflect.Method;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/** /**
* @author geng by * @author geng by