Skip to content

孙克 / smf-core

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

人工GR入库,生成取消任务

1 个父辈 893fb066
内嵌 并排
正在显示 3 个修改的文件 包含 46 行增加 和 2 行删除
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java
...@@ -15,11 +15,14 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve; ...@@ -15,11 +15,14 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve;
import com.neotel.smfcore.core.device.enums.OP; import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS; import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager; import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.agvBox.util.BoxUtil;
import com.neotel.smfcore.custom.luxsan.api.LuxsanApi; import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
import com.neotel.smfcore.custom.luxsan.api.bean.request.BrandQtyRequest; import com.neotel.smfcore.custom.luxsan.api.bean.request.BrandQtyRequest;
import com.neotel.smfcore.custom.luxsan.api.bean.request.NewLabelToCellRequest; import com.neotel.smfcore.custom.luxsan.api.bean.request.NewLabelToCellRequest;
...@@ -71,6 +74,9 @@ public class ManualGrPutInController { ...@@ -71,6 +74,9 @@ public class ManualGrPutInController {
@Autowired @Autowired
private IComponentManager componentManager; private IComponentManager componentManager;
@Autowired
private ILiteOrderItemManager liteOrderItemManager;
@ApiOperation("获取GR已过账的列表") @ApiOperation("获取GR已过账的列表")
@RequestMapping("/grStatus") @RequestMapping("/grStatus")
...@@ -367,11 +373,15 @@ public class ManualGrPutInController { ...@@ -367,11 +373,15 @@ public class ManualGrPutInController {
if (subCodeList != null && !subCodeList.isEmpty()){ if (subCodeList != null && !subCodeList.isEmpty()){
for (Barcode barcode : subCodeList) { for (Barcode barcode : subCodeList) {
if (barcode.isOut()){ if (barcode.isOut()){
String orderItemId = barcode.getOrderItemId();
barcode.setOdn(""); barcode.setOdn("");
barcode.setOrderId(""); barcode.setOrderId("");
barcode.setOrderItemId(""); barcode.setOrderItemId("");
barcode.setOut(false); barcode.setOut(false);
barcode = barcodeManager.save(barcode); barcode = barcodeManager.save(barcode);
generateTask(barcode,OP_STATUS.CANCEL.name(),barcode.getAmount(),OP.CHECKOUT,orderItemId);
} }
newSubCodeList.add(barcode); newSubCodeList.add(barcode);
} }
...@@ -455,4 +465,38 @@ public class ManualGrPutInController { ...@@ -455,4 +465,38 @@ public class ManualGrPutInController {
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
} }
private DataLog generateTask(Barcode barcode, String opStatus, int opQty, int opType, String orderItemId) {
//生成任务
DataLog task = new DataLog();
task.setStatus(opStatus);
task.setPartNumber(barcode.getPartNumber());
task.setBarcode(barcode.getBarcode());
task.setNum(opQty);
task.setType(opType);
task.setPosName(barcode.getPosName());
task.setOperator(SecurityUtils.getCurrentUsername());
task.setDateCode(barcode.getDateCode());
task.setBatchInfo(barcode.getBatch());
task.setProvider(barcode.getProvider());
task.setProviderNumber(barcode.getProviderNumber());
task.setKeeperCode(barcode.getKeeperCode());
task.setSubSourceId(orderItemId);
task.setWarehouseCode(barcode.getWarehouseCode());
if (StringUtils.isNotBlank(orderItemId)) {
LiteOrderItem orderItem = liteOrderItemManager.get(orderItemId);
if (orderItem != null) {
task.setSourceName(orderItem.getOrderNo());
task.setLine(orderItem.getLine());
task.setMo(orderItem.getMo());
task.setSide(orderItem.getSide());
task.setPlantCode(orderItem.getPlantCode());
task.setOrderNo(orderItem.getOrderNo());
task.setManualUpload(orderItem.isManualUpload());
}
}
taskService.updateFinishedTask(task);
return task;
}
} }
src/main/resources/config/application-21088prod.yml
...@@ -157,7 +157,7 @@ api: ...@@ -157,7 +157,7 @@ api:
binMove: http://10.68.30.22:8082/api/mlb/BinMove binMove: http://10.68.30.22:8082/api/mlb/BinMove
#砍单回库 #砍单回库
shipCancelUpshelf: http://10.68.30.22:8082/api/mlb/ShipCancelUpshelf shipCancelUpshelf: http://10.68.30.22:8082/api/mlb/CancelShelf
#单据退库上架 #单据退库上架
ticketUp: http://10.68.30.22:8082/api/mlb/ticketLabelToCell ticketUp: http://10.68.30.22:8082/api/mlb/ticketLabelToCell
......
src/main/resources/config/application-21088test.yml
...@@ -157,7 +157,7 @@ api: ...@@ -157,7 +157,7 @@ api:
binMove: http://10.42.220.171:8082/api/mlb/BinMove binMove: http://10.42.220.171:8082/api/mlb/BinMove
#砍单回库 #砍单回库
shipCancelUpshelf: http://10.42.220.171:8082/api/mlb/ShipCancelUpshelf shipCancelUpshelf: http://10.42.220.171:8082/api/mlb/CancelShelf
#单据退库上架 #单据退库上架
ticketUp: http://10.42.220.171:8082/api/mlb/ticketLabelToCell ticketUp: http://10.42.220.171:8082/api/mlb/ticketLabelToCell
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!