Merge remote-tracking branch 'origin/xuankuang' into xuankuang

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -9,8 +9,9 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdAdjForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
-import com.ruoyi.ams.task.service.IWcsTaskService;
+import com.ruoyi.ams.xuankuang.service.IBucketLocInvService;
 import com.ruoyi.base.constant.Constant;
+import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -38,6 +39,8 @@ import java.util.stream.Collectors;
 public class InvLotLocIdController extends BaseController {
     @Autowired
     private IInvLotLocIdService invLotLocIdService;
+    @Autowired
+    private IBucketLocInvService iBucketLocInvService;
 
     /**
      * 查询库位库存信息列表
@@ -104,13 +107,27 @@ public class InvLotLocIdController extends BaseController {
                 ? this.handleEmptyPalletIn(locationId) : this.handleEmptyPalletOut(locationId) ;
     }
 
-    private AjaxResult handleEmptyPalletOut(String locationId) {
-        return AjaxResult.success();
+    @Log(title = "出空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
+    @PostMapping("/moveEmptyPalletOut")
+    private AjaxResult handleEmptyPalletOut(@RequestParam String locationId) {
+        BaseLocationInfo baseLocationInfo = iBucketLocInvService.allocateLocationInfo();
+        return AjaxResult.success(move(buildInvLotLocIdMoveForm(String.valueOf(baseLocationInfo.getId()), locationId)));
     }
 
-    private AjaxResult handleEmptyPalletIn(String locationId) {
-        return AjaxResult.success();
+    @Log(title = "入空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
+    @PostMapping("/moveEmptyPalletIn")
+    private AjaxResult handleEmptyPalletIn(@RequestParam String locationId) {
+        BaseLocationInfo baseLocationInfo = iBucketLocInvService.selectLocationInfo();
+        return move(buildInvLotLocIdMoveForm(locationId, String.valueOf(baseLocationInfo.getId())));
+    }
 
+    private InvLotLocIdMoveForm buildInvLotLocIdMoveForm(String sourceLocationId, String targetLocationId) {
+        InvLotLocIdMoveForm invLotLocIdMoveForm = new InvLotLocIdMoveForm();
+        invLotLocIdMoveForm.setWarehouseId(Constant.WAREHOUSE_ID);
+        invLotLocIdMoveForm.setLocationFrom(sourceLocationId);
+        invLotLocIdMoveForm.setLocationTo(targetLocationId);
+        invLotLocIdMoveForm.setIsCallCar(Constant.IS_YES.Y.getValue());
+        return invLotLocIdMoveForm;
     }
 
     /**