移库需求增加接口

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

@@ -96,7 +96,15 @@ public class InvLotLocIdController extends BaseController {
     }
 
 
+    @Log(title = "库位库存移动", businessType = BusinessType.UPDATE)
+    @PostMapping("/moveLocInv")
+    public AjaxResult moveLocInv(@RequestParam String sourceLocationId, @RequestParam String targetLocationId) {
+        InvLotLocIdMoveForm invLotLocIdMoveForm = buildInvLotLocIdMoveForm(sourceLocationId, targetLocationId);
+        return invLotLocIdService.moveDirect(invLotLocIdMoveForm);
+    }
+
 
+    /* /ams/invLotLocId */
     @Log(title = "移动空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
     @PostMapping("/moveEmptyPallet")
     public AjaxResult moveEmptyPallet(@RequestParam String locationId, @RequestParam String moveType) {
@@ -123,9 +131,10 @@ public class InvLotLocIdController extends BaseController {
 
     private InvLotLocIdMoveForm buildInvLotLocIdMoveForm(String sourceLocationId, String targetLocationId) {
         InvLotLocIdMoveForm invLotLocIdMoveForm = new InvLotLocIdMoveForm();
-        invLotLocIdMoveForm.setWarehouseId(Constant.WAREHOUSE_ID);
         invLotLocIdMoveForm.setLocationFrom(sourceLocationId);
         invLotLocIdMoveForm.setLocationTo(targetLocationId);
+        invLotLocIdMoveForm.setUpdateBy(getUsername());
+        invLotLocIdMoveForm.setWarehouseId(Constant.WAREHOUSE_ID);
         invLotLocIdMoveForm.setIsCallCar(Constant.IS_YES.Y.getValue());
         return invLotLocIdMoveForm;
     }

ruoyi-admin/src/main/java/com/ruoyi/xuankuang/controller/PdaAgvCallController.java

@@ -49,7 +49,7 @@ public class PdaAgvCallController {
     @PostMapping("/bucketOutOfStorage")
     public AjaxResult bucketOutOfStorage(@RequestParam String palletNo, @RequestParam String materialType,
                                           @RequestParam String targetLocationId, @RequestParam  Double quantity) {
-        agvCallProxyService.bucketOutOfStorage(palletNo, materialType, targetLocationId, quantity);
+        agvCallProxyService.bucketOutOfStorage(materialType, targetLocationId, quantity);
         return AjaxResult.success("桶装出库下发任务成功");
     }
 }

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/AgvCallProxyService.java

@@ -129,7 +129,7 @@ public class AgvCallProxyService {
 
 
     @Transactional(rollbackFor = RuntimeException.class)
-    public void bucketOutOfStorage(String palletNo, String materialType, String targetLocationId, Double quantity) {
+    public void bucketOutOfStorage(String materialType, String targetLocationId, Double quantity) {
         BaseSku baseSku  = iBaseSkuService.selectBaseSkuByMaterialType(materialType);
         Assert.isTrue(ObjectUtil.isNotNull(baseSku) && StringUtils.isNotBlank(baseSku.getSku()), "the materialType is illegal");
         String orderNo = idSequenceUtils.generateId(Constant.ID_TYPE.ORDERNO.getDesc());
@@ -148,7 +148,7 @@ public class AgvCallProxyService {
             String taskNo = idSequenceUtils.generateId(Constant.ID_TYPE.LOTNUMBER.getDesc());
             String locationInfoId = String.valueOf(baseLocationLotatt.getId());
             //每个推荐的出库库存都创建一个wcs任务
-            wcsTaskSubService.addWcsOutTask(taskNo, locationInfoId, Constant.DRUM_CONNECTORS.toString(), orderNo, palletNo);
+            wcsTaskSubService.addWcsOutTask(taskNo, locationInfoId, Constant.DRUM_CONNECTORS.toString(), orderNo);
             OutTaskForm outTaskForm = assemblyOutTaskForm(orderNo, taskNo,  baseSku.getSkuType(), materialType, quantity, baseLocationLotatt);
             WcsResponseVo wcsResponseVo = wmsToWcsApiService.wmsOutTask(outTaskForm);
             if (!wcsResponseVo.isSuccess()) {
@@ -212,7 +212,6 @@ public class AgvCallProxyService {
         Assert.isTrue(ObjectUtil.isNotNull(baseLocationInfo), "baseLocationLotatt is null");
         // 2.桶装接驳位生成库存
         invLotLocIdSubService.initInv(bucketCacheLocationId, baseSku.getSku(), palletNo, asnNo, taskNo, quantity);
-
         // 3.生成任务
         wcsTaskSubService.addWcsTask(taskNo, bucketCacheLocationId
                 , String.valueOf(baseLocationInfo.getId()), asnNo, palletNo, Constant.TASK_STS.TASK_PUBILSH.getLongValue(), "四向车入库任务");

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WcsTaskSubService.java

@@ -145,6 +145,11 @@ public class WcsTaskSubService {
 
     }
 
+    public AjaxResult addWcsOutTask(String taskNo, String locationFrom, String locationTo
+            , String orderNo) {
+        return addWcsOutTask(taskNo, locationFrom, locationTo, orderNo, StringUtils.EMPTY, 10L, "立体库出库任务");
+    }
+
 
     /**
      * 增加越库任务

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WcsToWmsApiService.java

@@ -281,8 +281,6 @@ public class WcsToWmsApiService {
             //TODO 这一块有可疑的地方 baseLocationLotatt
             String pallentNo = ObjectUtil.isNotNull(baseLocationLotatt.getLotattVO())
                     ? baseLocationLotatt.getLotattVO().getLotatt07() : StringUtils.EMPTY;
-            String locationFrom = baseLocationLotatt.getLocationNo();
-
 
             // 生成四向车出库任务
             AjaxResult ajaxResult = wcsTaskSubService.addWcsOutTask(baseLocationLotatt.getLocationNo(), Constant.LOC_SORTATION_CACHE.toString(), "", pallentNo, wcsNo);