diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java index 8a43601..25f0894 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java @@ -43,6 +43,12 @@ public class PdaCommonController { public ResponseEntity getSectList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCommonService.getSectList(whereJson), HttpStatus.OK); } + @PostMapping("/inEmptyVehicle") + @Log("空载具入库-呼叫入库") + @SaIgnore + public ResponseEntity inEmptyVehicle(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaCommonService.inEmptyVehicle(whereJson), HttpStatus.OK); + } @PostMapping("/confirmBagAssembly") @Log("物料组袋-确认组袋") @SaIgnore diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java index f5d4a52..a545363 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java @@ -34,4 +34,11 @@ public interface PdaCommonService { * @return */ PdaResponse confirmPalletAssembly(AssemblyPalletParam param); + + /** + * 空托盘入库 + * @param param + * @return + */ + PdaResponse inEmptyVehicle(JSONObject param); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index c4e3eff..aa1f4f7 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -23,6 +23,7 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask; import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleOutTask; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; +import org.nl.wms.warehouse_management.service.VehicleInService; import org.nl.wms.warehouse_management.service.VehicleOutService; import org.nl.wms.warehouse_management.service.dao.GroupPlate; import org.redisson.api.RLock; @@ -44,6 +45,8 @@ public class PdaCommonServiceImpl implements PdaCommonService { @Resource private VehicleOutService vehicleOutService; @Resource + private VehicleInService vehicleInService; + @Resource private IStructattrService iStructattrService; @Resource private ISchBaseTaskService taskService; @@ -156,7 +159,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { @Override public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) { -// storagevehicleinfoService.getByCode(param.getVehicle_code()); + storagevehicleinfoService.getByCode(param.getVehicle_code()); List groupPlates = param.getGroup_plates(); for (GroupPlate groupPlate : groupPlates) { groupPlate.setVehicle_code(param.getVehicle_code()); @@ -165,4 +168,11 @@ public class PdaCommonServiceImpl implements PdaCommonService { groupplateService.updateBatchById(groupPlates); return PdaResponse.requestOk("组盘成功!"); } + + @Override + public PdaResponse inEmptyVehicle(JSONObject param) { + log.info("手持请求空托盘入库:{}", param); + vehicleInService.create(param); + return PdaResponse.requestOk(); + } }