Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a34a4d54 由 zshaohui
选项

入库问题提交

1 个父辈 35d882b9
内嵌 并排
正在显示 10 个修改的文件 包含 37 行增加 和 27 行删除
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
...@@ -1155,29 +1155,32 @@ public class TaskService { ...@@ -1155,29 +1155,32 @@ public class TaskService {
//记录在库时长 //记录在库时长
task.setInStoreTime(barcode.getInStoreMiniute()); task.setInStoreTime(barcode.getInStoreMiniute());
barcode = barcodeManager.get(barcode.getId());
if (barcode != null) {
//二维码状态
barcode.setUsed(true);
barcode.setUsedDate(new Date());
//仓位状态
barcode.setCheckOutDate(new Date(), task.getOperator());
barcode.setPosName("");
barcodeManager.save(barcode);
String specifiedBatchId = barcode.getLockId();
if (!Strings.isNullOrEmpty(specifiedBatchId)) {
task.setBatchId(specifiedBatchId);
task.setBatchInfo(barcode.getLockName());
}
}
storagePos.setBarcode(null); if (barcode != null && barcode.getBarcode().equals(task.getBarcode())) {
storagePos.setUsed(false);
storagePosManager.save(storagePos); barcode = barcodeManager.get(barcode.getId());
if (barcode != null) {
//二维码状态
barcode.setUsed(true);
barcode.setUsedDate(new Date());
//仓位状态
barcode.setCheckOutDate(new Date(), task.getOperator());
barcode.setPosName("");
barcodeManager.save(barcode);
String specifiedBatchId = barcode.getLockId();
if (!Strings.isNullOrEmpty(specifiedBatchId)) {
task.setBatchId(specifiedBatchId);
task.setBatchInfo(barcode.getLockName());
}
}
storagePos.setBarcode(null);
storagePos.setUsed(false);
storagePosManager.save(storagePos);
}
log.info(task.getBarcode() + "出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]"); log.info(task.getBarcode() + "出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]");
//更新缓存中的库存信息 //更新缓存中的库存信息
dataCache.updateInventory(storagePos, barcode); dataCache.updateInventory(storagePos, barcode);
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/WarehouseController.java
...@@ -538,7 +538,7 @@ public class WarehouseController { ...@@ -538,7 +538,7 @@ public class WarehouseController {
//判断是否盘点完成 //判断是否盘点完成
boolean finished = BoxUtil.isInventoryFinished(boxStr); boolean finished = BoxUtil.isInventoryFinished(boxStr);
if (!finished) { if (!finished) {
return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点"); //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
} }
boxBarcode.setInventory(false); boxBarcode.setInventory(false);
boxBarcode = barcodeManager.save(boxBarcode); boxBarcode = barcodeManager.save(boxBarcode);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/ReturnTower.java
...@@ -9,6 +9,8 @@ public class ReturnTower { ...@@ -9,6 +9,8 @@ public class ReturnTower {
private String materialStr; private String materialStr;
private String partNumber;
private String warehouseCode; private String warehouseCode;
private String provider; private String provider;
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/StorTransfer.java
...@@ -11,6 +11,8 @@ public class StorTransfer { ...@@ -11,6 +11,8 @@ public class StorTransfer {
private String warehouseCode; private String warehouseCode;
private String partNumber;
private String provider; private String provider;
private int w; private int w;
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -831,7 +831,7 @@ public class CDeviceController { ...@@ -831,7 +831,7 @@ public class CDeviceController {
if (MaterialUtil.storTransfer(stackerId)) { if (MaterialUtil.storTransfer(stackerId)) {
StorTransfer storTransfer = MaterialUtil.getStorTransferInfo(stackerId); StorTransfer storTransfer = MaterialUtil.getStorTransferInfo(stackerId);
partNumber = storTransfer.getMaterialStr(); partNumber = storTransfer.getPartNumber();
provider = storTransfer.getProvider(); provider = storTransfer.getProvider();
} else if (MaterialUtil.ticketTransfer(stackerId)){ } else if (MaterialUtil.ticketTransfer(stackerId)){
TicketTransfer ticketTransfer = MaterialUtil.getTicketTransferInfo(stackerId); TicketTransfer ticketTransfer = MaterialUtil.getTicketTransferInfo(stackerId);
...@@ -848,7 +848,7 @@ public class CDeviceController { ...@@ -848,7 +848,7 @@ public class CDeviceController {
dateStr = bindGrInfo.getGrDate(); dateStr = bindGrInfo.getGrDate();
} else if (MaterialUtil.returnTower(stackerId)){ } else if (MaterialUtil.returnTower(stackerId)){
ReturnTower returnTower = MaterialUtil.getReturnTowerInfo(stackerId); ReturnTower returnTower = MaterialUtil.getReturnTowerInfo(stackerId);
partNumber = returnTower.getMaterialStr(); partNumber = returnTower.getPartNumber();
provider = returnTower.getProvider(); provider = returnTower.getProvider();
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/ReturnTowerController.java
...@@ -99,7 +99,7 @@ public class ReturnTowerController { ...@@ -99,7 +99,7 @@ public class ReturnTowerController {
h = 32; h = 32;
} }
ReturnTower returnTower = new ReturnTower(materialStr,warehouseCode,barcode.getProvider(),reelSize,h); ReturnTower returnTower = new ReturnTower(materialStr,barcode.getPartNumber(),warehouseCode,barcode.getProvider(),reelSize,h);
//1.判断料仓信息是否在储位转移中 //1.判断料仓信息是否在储位转移中
Map<String, ReturnTower> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_RETURN_TOWER); Map<String, ReturnTower> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_RETURN_TOWER);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/StorTransferController.java
...@@ -92,7 +92,7 @@ public class StorTransferController { ...@@ -92,7 +92,7 @@ public class StorTransferController {
h = 32; h = 32;
} }
StorTransfer storTransfer = new StorTransfer(materialStr,warehouseCode,barcode.getProvider(),reelSize,h); StorTransfer storTransfer = new StorTransfer(materialStr,warehouseCode,barcode.getPartNumber(),barcode.getProvider(),reelSize,h);
//1.判断料仓信息是否在储位转移中 //1.判断料仓信息是否在储位转移中
Map<String, StorTransfer> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_STOR_TRANSFER); Map<String, StorTransfer> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_STOR_TRANSFER);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java
...@@ -367,7 +367,7 @@ public class ManualGrPutInController { ...@@ -367,7 +367,7 @@ public class ManualGrPutInController {
//判断盘点是否完成 //判断盘点是否完成
boolean finished = BoxUtil.isInventoryFinished(boxStr); boolean finished = BoxUtil.isInventoryFinished(boxStr);
if (!finished) { if (!finished) {
return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点"); //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
} }
//1.清理要出库的数据 //1.清理要出库的数据
...@@ -516,6 +516,7 @@ public class ManualGrPutInController { ...@@ -516,6 +516,7 @@ public class ManualGrPutInController {
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
dataLog.setOperator(SecurityUtils.getLoginUsername());
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
} }
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualReturnTowerController.java
...@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller.manual; ...@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller.manual;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.DateUtil; import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.common.utils.StringUtils; import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.api.SmfApi; import com.neotel.smfcore.core.api.SmfApi;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
...@@ -239,6 +240,7 @@ public class ManualReturnTowerController { ...@@ -239,6 +240,7 @@ public class ManualReturnTowerController {
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
dataLog.setOperator(SecurityUtils.getLoginUsername());
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
} }
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/ManualLineController.java
...@@ -138,7 +138,7 @@ public class ManualLineController { ...@@ -138,7 +138,7 @@ public class ManualLineController {
boolean finished = BoxUtil.isInventoryFinished(boxBarcode.getBarcode()); boolean finished = BoxUtil.isInventoryFinished(boxBarcode.getBarcode());
if (!finished) { if (!finished) {
return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点"); //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
} }
//1.清理要出库的数据 //1.清理要出库的数据
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!