Skip to content

孙克 / smf-core

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

1.结构仓拆包通知更改

1 个父辈 f5082a68
内嵌 并排
正在显示 4 个修改的文件 包含 13 行增加 和 39 行删除
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/AgvDeviceController.java
...@@ -91,8 +91,6 @@ public class AgvDeviceController { ...@@ -91,8 +91,6 @@ public class AgvDeviceController {
} }
} }
} }
//判断有没有任务 //判断有没有任务
DataLog dataLog = null; DataLog dataLog = null;
List<DataLog> allTasks = taskService.getAllTasks(); List<DataLog> allTasks = taskService.getAllTasks();
...@@ -114,7 +112,6 @@ public class AgvDeviceController { ...@@ -114,7 +112,6 @@ public class AgvDeviceController {
Storage storage = dataCache.getStorage(cid); Storage storage = dataCache.getStorage(cid);
storageList.add(storage); storageList.add(storage);
cidList.add(storage.getCid()); cidList.add(storage.getCid());
ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode()); ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", ""); StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", "");
if (pos == null) { if (pos == null) {
...@@ -127,7 +124,6 @@ public class AgvDeviceController { ...@@ -127,7 +124,6 @@ public class AgvDeviceController {
log.info("清理锁定库位：库位号[" + oldLockInfo.getLockPosName() + "]上物料[" + oldLockInfo.getBarcode() + "]锁定的库位"); log.info("清理锁定库位：库位号[" + oldLockInfo.getLockPosName() + "]上物料[" + oldLockInfo.getBarcode() + "]锁定的库位");
} }
} }
ReelLockPosInfo reelLocInfo = new ReelLockPosInfo(); ReelLockPosInfo reelLocInfo = new ReelLockPosInfo();
reelLocInfo.setBarcode(barcode.getBarcode()); reelLocInfo.setBarcode(barcode.getBarcode());
reelLocInfo.setCid(storage.getCid()); reelLocInfo.setCid(storage.getCid());
...@@ -137,31 +133,7 @@ public class AgvDeviceController { ...@@ -137,31 +133,7 @@ public class AgvDeviceController {
if (reelLocInfo == null) { if (reelLocInfo == null) {
return ResultBean.newErrorResult(-1, "", "[" + barcode.getBarcode() + "]库位[" + reelLocInfo.getLockPosName() + "]已被锁定,暂停入库", new String[]{}); return ResultBean.newErrorResult(-1, "", "[" + barcode.getBarcode() + "]库位[" + reelLocInfo.getLockPosName() + "]已被锁定,暂停入库", new String[]{});
} }
//通知momo系统拆包数据
InListItem item = null;
String pidBarcode = barcode.getPidBarcode();
if (StringUtils.isNotEmpty(pidBarcode)){
Barcode splitBarcode = barcodeManager.findByBarcode(pidBarcode);
//判断有没有对应的入库单
InList inList = inListCache.getInList(barcode.getReceiptOrder());
if (inList != null){
for (InListItem inListItem : inList.getInListItems()) {
if (splitBarcode.getPidBarcode().equals(inListItem.getRi())){
item = inListItem;
break;
}
}
}
}
DataLog inTask = BoxUtil.generateInTask(pos, barcode, currentLoc); DataLog inTask = BoxUtil.generateInTask(pos, barcode, currentLoc);
inTask.setContainer(barcode.getPidBarcode());
inTask.setStockReturn(barcode.getReceiptOrder());
inTask.setProductName(barcode.getDescription());
inTask.setStockreturnNoLine(barcode.getRowNumber());
if (item != null){
inTask.setQty(item.getNum());
}
taskService.addTaskToExecute(inTask); taskService.addTaskToExecute(inTask);
resultMap.put("boxStr", barcode.getBarcode()); resultMap.put("boxStr", barcode.getBarcode());
resultMap.put("posName", inTask.getPosName()); resultMap.put("posName", inTask.getPosName());
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/MaterialUnpackingController.java
...@@ -274,6 +274,7 @@ public class MaterialUnpackingController { ...@@ -274,6 +274,7 @@ public class MaterialUnpackingController {
private Barcode updateBoxBarcode(Barcode boxBarcode,Barcode barcode){ private Barcode updateBoxBarcode(Barcode boxBarcode,Barcode barcode){
//设置当前料箱的信息 //设置当前料箱的信息
boxBarcode.setPidBarcode(barcode.getBarcode()); boxBarcode.setPidBarcode(barcode.getBarcode());
boxBarcode.setRowNumber(barcode.getRowNumber());
boxBarcode.setPartNumber(barcode.getPartNumber()); boxBarcode.setPartNumber(barcode.getPartNumber());
boxBarcode.setAmount(barcode.getAmount()); boxBarcode.setAmount(barcode.getAmount());
boxBarcode.setBatch(barcode.getBatch()); boxBarcode.setBatch(barcode.getBatch());
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/MomoApi.java
...@@ -51,7 +51,7 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -51,7 +51,7 @@ public class MomoApi extends BaseSmfApiListener {
Barcode barcode = barcodeManager.findByBarcode(barcodeStr); Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
String receiptOrder = barcode.getReceiptOrder(); String receiptOrder = barcode.getReceiptOrder();
if (StringUtils.isNotEmpty(receiptOrder)){ if (StringUtils.isNotEmpty(receiptOrder)){
stockIn(task); stockIn(barcode);
} else { } else {
if (StringUtils.isNotEmpty(barcode.getCheckOutOrder())){ if (StringUtils.isNotEmpty(barcode.getCheckOutOrder())){
stockReturn(task); stockReturn(task);
...@@ -60,21 +60,20 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -60,21 +60,20 @@ public class MomoApi extends BaseSmfApiListener {
} }
} }
public void stockIn(DataLog task) { public void stockIn(Barcode barcode) {
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("StockinNo", task.getStockReturn()); paramMap.put("StockinNo", barcode.getReceiptOrder());
Map<String, Object> itemMap = new HashMap<>(); Map<String, Object> itemMap = new HashMap<>();
itemMap.put("StockinNoline", task.getStockreturnNoLine()); itemMap.put("StockinNoline", barcode.getRowNumber());
if (StringUtils.isNotEmpty(task.getContainer())) { if (StringUtils.isNotEmpty(barcode.getPidBarcode())) {
itemMap.put("Container", task.getContainer()); itemMap.put("Container", barcode.getPidBarcode());
} else { } else {
itemMap.put("Container", task.getBarcode()); itemMap.put("Container", barcode.getBarcode());
} }
itemMap.put("ProductNo", task.getPartNumber()); itemMap.put("ProductNo", barcode.getPartNumber());
itemMap.put("ProductName", task.getProductName()); itemMap.put("ProductName", barcode.getDescription());
itemMap.put("QuantityOnHand", task.getNum()); itemMap.put("QuantityOnHand", barcode.getAmount());
paramMap.put("DetailItems", Arrays.asList(itemMap)); paramMap.put("DetailItems", Arrays.asList(itemMap));
log.info("接口2：MOM接收WMS的入库结果,请求参数为:" + JSON.toJSONString(paramMap)); log.info("接口2：MOM接收WMS的入库结果,请求参数为:" + JSON.toJSONString(paramMap));
try { try {
String resultStr = HttpHelper.postJson(stockInUrl, paramMap); String resultStr = HttpHelper.postJson(stockInUrl, paramMap);
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/util/BoxUtil.java
...@@ -51,6 +51,8 @@ public class BoxUtil { ...@@ -51,6 +51,8 @@ public class BoxUtil {
//仓位状态 //仓位状态
barcode.setCheckOutDate(new Date(), ""); barcode.setCheckOutDate(new Date(), "");
barcode.setPosName(""); barcode.setPosName("");
barcode.setReceiptOrder("");
barcode.setRowNumber("");
barcodeManager.save(barcode); barcodeManager.save(barcode);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!