Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
zhaoxiaolin 3 months ago
parent d79301f588 fbb0bf5e12
commit a5db9cd88b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
Unescape Escape View File

@ -298,7 +298,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("BATCH", wmsProductPut3.getAttr4()); map.put("BATCH", wmsProductPut3.getAttr4());
map.put("STCK_TYPE", wmsProductPut1.getAttr3()); map.put("STCK_TYPE", wmsProductPut1.getAttr3());
if (wmsProductPut3.getBatchNumber().length()==24){ if (wmsProductPut3.getBatchNumber().trim().length()==24){
String HSDAT = InterceptionSJRules(wmsProductPut3.getBatchNumber()); String HSDAT = InterceptionSJRules(wmsProductPut3.getBatchNumber());
map.put("HSDAT", HSDAT); map.put("HSDAT", HSDAT);
@ -516,8 +516,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("ERFME", mesReportWork.getUnit()); map.put("ERFME", mesReportWork.getUnit());
map.put("BATCH", mesReportWork.getBatchSK()); map.put("BATCH", mesReportWork.getBatchSK());
map.put("STCK_TYPE", selectedType); map.put("STCK_TYPE", selectedType);
if (mesReportWork.getBatch().length()==24){ if (mesReportWork.getBatch().trim().length()==24){
//String batch = mesReportWork.getBatch().substring(12);
String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); String HSDAT = InterceptionSJRules(mesReportWork.getBatch());
map.put("HSDAT", HSDAT); map.put("HSDAT", HSDAT);
}else { }else {
@ -559,7 +559,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("ERFME", mesReportWork.getUnit()); map.put("ERFME", mesReportWork.getUnit());
map.put("BATCH", mesReportWork.getBatchSK()); map.put("BATCH", mesReportWork.getBatchSK());
map.put("STCK_TYPE", selectedType); map.put("STCK_TYPE", selectedType);
if (mesReportWork.getBatch().length()==24){ if (mesReportWork.getBatch().trim().length()==24){
//String batch = mesReportWork.getBatch().substring(12); //String batch = mesReportWork.getBatch().substring(12);
String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); String HSDAT = InterceptionSJRules(mesReportWork.getBatch());
map.put("HSDAT", HSDAT); map.put("HSDAT", HSDAT);
@ -1172,7 +1172,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsProductPutk.setStatus("2");// wmsProductPutk.setStatus("2");//
wmsProductPutk.setSapStatus("0"); wmsProductPutk.setSapStatus("0");
wmsProductPutk.setAttr3(formattedDate);// wmsProductPutk.setAttr3(formattedDate);//
if (wmsProductPutk.getBatchNumber().length()==24){ if (wmsProductPutk.getBatchNumber().trim().length()==24){
//String batch = mesReportWork.getBatch().substring(12); //String batch = mesReportWork.getBatch().substring(12);
String batch = InterceptionRules(wmsProductPutk.getBatchNumber()); String batch = InterceptionRules(wmsProductPutk.getBatchNumber());
wmsProductPutk.setAttr4(batch); wmsProductPutk.setAttr4(batch);

Write Preview
Loading…
Cancel
Save