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

更新

Browse Source
This commit is contained in:
loujf
2022-08-02 10:20:03 +08:00
parent 25b226b4b4
commit 636b2ddd67
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,6 +339,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
ProduceshiftorderDto dto = new ProduceshiftorderDto(); ProduceshiftorderDto dto = new ProduceshiftorderDto();
dto.setOrder_code(producetask_code); dto.setOrder_code(producetask_code);
dto.setProduct_code(product_code); dto.setProduct_code(product_code);
dto.setDevice_code(device_code);
dto.setOrder_status("1"); dto.setOrder_status("1");
dto.setMaterial_code(material_code); dto.setMaterial_code(material_code);
dto.setMaterial_name(material_name); dto.setMaterial_name(material_name);

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -171,7 +171,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
//判断是否为wms下发的排产单 //判断是否为wms下发的排产单
String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS); String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS);
if (dto.getProduct_code().equals("wms") && hasWms.equals("1")) { if (StrUtil.isNotEmpty(dto.getProduct_code()) && hasWms.equals("1")) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("producetask_code",dto.getOrder_code()); json.put("producetask_code",dto.getOrder_code());
json.put("device_code",dto.getDevice_code()); json.put("device_code",dto.getDevice_code());