Commit 086e21c5 zshaohui

1.通知迈征,pn用迈征发的

2.条码统一转成大写
1 个父辈 6d0cbc70
......@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
/**
*
......@@ -512,6 +513,9 @@ public class BarcodeRule {
codeStr = arr[1];
}
codeStr = codeStr.toUpperCase(Locale.ROOT);
codeBean.setCodeStr(codeStr);
if(!isValidRule()){
codeBean.setError("smfcore.error.barcode.noRule","解析规则未定义");
......
......@@ -122,7 +122,7 @@ public class MaiZhengDeviceController {
if (outDetailList != null && !outDetailList.isEmpty()){
for (ItemOutDetail detail : outDetailList) {
Map<String, Object> map = new HashMap<>();
map.put("PARTNUMBER",detail.getPartNumber());
map.put("PARTNUMBER",orderItem.getPn());
map.put("ReelNewLong",detail.getReelNewLong());
map.put("ReelNew",detail.getReelNew());
map.put("ReelOld",orderItem.getReel());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!