Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d42d9734 由 张少辉
选项

1.解析唯一码修改

1 个父辈 5cbae4a0
内嵌 并排
正在显示 1 个修改的文件 包含 11 行增加 和 8 行删除
src/main/java/com/neotel/smfcore/custom/so1374/PokaNonInboundAndReturnController.java
...@@ -78,19 +78,20 @@ public class PokaNonInboundAndReturnController { ...@@ -78,19 +78,20 @@ public class PokaNonInboundAndReturnController {
PokaNonInboundReturnRequest.Label label = request.getLabel(); PokaNonInboundReturnRequest.Label label = request.getLabel();
if ("INBOUND".equals(operation)) { if ("INBOUND".equals(operation)) {
//新入库（operation=INBOUND）：serial 在 SMF 在库中需保持唯一，重复则拒绝入库，成功后 SMF 生成并返回 uid //新入库（operation=INBOUND）：serial 在 SMF 在库中需保持唯一，重复则拒绝入库，成功后 SMF 生成并返回 uid
barcode = barcodeManager.findOneByLockName(material.getSerial()); barcode = barcodeManager.findByBarcode(material.getSerial());
if (barcode != null) { if (barcode != null) {
// 新增：serial重复日志 // 新增：serial重复日志
log.error("新入库序列号重复，serial:" + material.getSerial() + "，clientTxnId:" + request.getClientTxnId()); log.error("新入库序列号重复，serial:" + material.getSerial() + "，clientTxnId:" + request.getClientTxnId());
//1002 DUPLICATE_SERIAL 新入库：序列号已存在于 SMF 在库中，拒绝入库；再入库：仅当未生成新 uid 时触发该错误 //1002 DUPLICATE_SERIAL 新入库：序列号已存在于 SMF 在库中，拒绝入库；再入库：仅当未生成新 uid 时触发该错误
return ResultBean.newErrorResult(1002, "DUPLICATE_SERIAL"); return ResultBean.newErrorResult(1002, "DUPLICATE_SERIAL");
} }
barcode = createBarcode(material, label); barcode = createBarcode(material, label,barcode);
// 新增：新入库条码创建完成日志 // 新增：新入库条码创建完成日志
log.info("新入库条码创建完成，serial:" + material.getSerial() + "，uid:" + barcode.getBarcode()); log.info("新入库条码创建完成，serial:" + material.getSerial() + "，uid:" + barcode.getBarcode());
} else if ("RETURN".equals(operation)) { } else if ("RETURN".equals(operation)) {
barcode = createBarcode(material, label); barcode = barcodeManager.findByBarcode(material.getSerial());
barcode = createBarcode(material, label,barcode);
// 新增：退库条码创建完成日志 // 新增：退库条码创建完成日志
log.info("退库条码创建完成，serial:" + material.getSerial() + "，uid:" + barcode.getBarcode()); log.info("退库条码创建完成，serial:" + material.getSerial() + "，uid:" + barcode.getBarcode());
} else { } else {
...@@ -116,7 +117,7 @@ public class PokaNonInboundAndReturnController { ...@@ -116,7 +117,7 @@ public class PokaNonInboundAndReturnController {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("smfTxnId", request.getClientTxnId()); resultMap.put("smfTxnId", request.getClientTxnId());
resultMap.put("serial", material.getSerial()); resultMap.put("serial", material.getSerial());
resultMap.put("uid", barcode.getBarcode()); resultMap.put("uid", barcode.getLockName());
resultMap.put("status", "COMPLETED"); resultMap.put("status", "COMPLETED");
resultMap.put("serverTime", DateUtil.toDateString(new Date(), "yyyy-MM-dd HH:mm:ss")); resultMap.put("serverTime", DateUtil.toDateString(new Date(), "yyyy-MM-dd HH:mm:ss"));
//构建registered信息 //构建registered信息
...@@ -210,10 +211,12 @@ public class PokaNonInboundAndReturnController { ...@@ -210,10 +211,12 @@ public class PokaNonInboundAndReturnController {
return pos; return pos;
} }
private Barcode createBarcode(PokaNonInboundReturnRequest.Material material, PokaNonInboundReturnRequest.Label label) { private Barcode createBarcode(PokaNonInboundReturnRequest.Material material, PokaNonInboundReturnRequest.Label label,Barcode barcode) {
String uid = material.getSerial() + "_" + DateUtil.toDateString(new Date(), "yyyyMMddHHmmss"); String uid = material.getSerial() + "_" + DateUtil.toDateString(new Date(), "yyyyMMddHHmmss");
Barcode barcode = new Barcode(); if (barcode == null){
barcode.setBarcode(uid); barcode = new Barcode();
}
barcode.setBarcode(material.getSerial());
barcode.setPartNumber(material.getPartNo()); barcode.setPartNumber(material.getPartNo());
barcode.setProvider(material.getMakerPartNo()); barcode.setProvider(material.getMakerPartNo());
barcode.setBatch(material.getMakerLot()); barcode.setBatch(material.getMakerLot());
...@@ -237,7 +240,7 @@ public class PokaNonInboundAndReturnController { ...@@ -237,7 +240,7 @@ public class PokaNonInboundAndReturnController {
barcode.setLabelAmount(qrQty); barcode.setLabelAmount(qrQty);
} }
} }
barcode.setLockName(material.getSerial()); barcode.setLockName(uid);
barcode = barcodeManager.save(barcode); barcode = barcodeManager.save(barcode);
return barcode; return barcode;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!