增加 调拨入

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java

@@ -31,6 +31,7 @@ public class WmsPdaApiController extends BaseController {
     private final IWmsInventoryService wmsInventoryService;
     private final IWmsMoveOrderService wmsMoveOrderService;
     private final IWmsAllocateOrderDetailService wmsAllocateOrderDetailService;
+    private final IWmsAllocateTaskService wmsAllocateTaskService;
 
     /**
      * 原材料退库-现场扫描
@@ -155,8 +156,9 @@ public class WmsPdaApiController extends BaseController {
         if (orderType.equals("5")) {
             wmsOutstockDetailVoList = apiService.outSelectByOrderCode(orderCode);
             wmsOutstockDetailVoList.forEach(item -> {
-                WmsInventoryVo inventory = wmsInventoryService.selectOrderBeachCode(item.getMaterialId());
+                List<WmsInventoryVo> inventoryVoList = wmsInventoryService.selectOrderBeachCode(item.getMaterialId());
-                if (inventory != null) {
+                if (inventoryVoList != null) {
+                    WmsInventoryVo inventory = inventoryVoList.get(0);
                     item.setLocationCode(inventory.getLocationCode());
                     item.setBatchCode(inventory.getBatchCode());
                     item.setInventoryQty(inventory.getInventoryQty());
@@ -169,7 +171,8 @@ public class WmsPdaApiController extends BaseController {
                 wmsOutstockDetailVoList = new ArrayList<>(list.size());
 
                 list.forEach(item -> {
-                    WmsInventoryVo inventory = wmsInventoryService.selectOrderBeachCode(item.getMaterialId());
+                    List<WmsInventoryVo> inventoryList = wmsInventoryService.selectOrderBeachCode(item.getMaterialId());
+                    WmsInventoryVo inventory = inventoryList.get(0);
                     WmsOutstockDetailVo vo = new WmsOutstockDetailVo();
                     vo.setOutstockCode(item.getAllocateCode());
                     vo.setLocationCode(inventory.getLocationCode());
@@ -303,7 +306,6 @@ public class WmsPdaApiController extends BaseController {
         return R.ok("查询成功", tyreInfo);
     }
 
-
     /**
      * 成品跟载具绑定
      *
@@ -398,7 +400,6 @@ public class WmsPdaApiController extends BaseController {
         return R.ok(wmsHppStorageDetailVo);
     }
 
-
     @PostMapping("/semi/submitOutInfo")
     public R<Void> semiSubmitOutInfo(@RequestBody WmsHppStorageDetailVo vo) {
         Boolean result = apiService.semiSubmitOutInfo(vo);
@@ -518,4 +519,18 @@ public class WmsPdaApiController extends BaseController {
         return list == null ? R.fail() : R.ok(list);
     }
 
+    //调拨入库提交
+    @PostMapping("/allocate/SelectCode")
+    private R<WmsAllocateTaskVo> allocateSelectCode(String code) {
+        List<WmsAllocateTaskVo> list = wmsAllocateTaskService.allocateSelectCode(code);
+        return list == null ? R.fail() : R.ok(list.get(0));
+    }
+
+    @PostMapping("/allocate/inSubmit")
+    private R<Void> allocateinSubmit(@RequestBody WmsAllocateTaskVo vo) {
+        // List<WmsAllocateTaskVo> list = wmsAllocateTaskService.allocateSelectCode(code);
+        // return list == null ? R.fail() : R.ok(list.get(0));
+        return R.ok();
+    }
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsAllocateTaskService.java

@@ -131,4 +131,6 @@ public interface IWmsAllocateTaskService {
      * @return 是否删除成功
      */
     Boolean deleteTasksByDetailId(Long aoDId);
+
+    List<WmsAllocateTaskVo> allocateSelectCode(String code);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsInventoryService.java

@@ -127,5 +127,5 @@ public interface IWmsInventoryService {
      */
     List<WmsInventoryVo> getListInventoryAlarm(WmsInventoryBo bo);
 
-    WmsInventoryVo selectOrderBeachCode(Long materialId);
+    List<WmsInventoryVo> selectOrderBeachCode(Long materialId);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateTaskServiceImpl.java

@@ -1,34 +1,28 @@
 package org.dromara.wms.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.dromara.common.core.exception.ServiceException;
-import org.springframework.transaction.annotation.Transactional;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.wms.domain.WmsAllocateTask;
 import org.dromara.wms.domain.bo.WmsAllocateTaskBo;
 import org.dromara.wms.domain.vo.WmsAllocateTaskVo;
-import org.dromara.wms.domain.WmsAllocateTask;
-import org.dromara.wms.domain.WmsAllocateOrderDetail;
-import org.dromara.wms.domain.BaseMaterialInfo;
 import org.dromara.wms.mapper.WmsAllocateTaskMapper;
-import org.dromara.wms.service.IWmsAllocateTaskService;
-import org.dromara.wms.service.IWmsAllocateOrderDetailService;
 import org.dromara.wms.service.IBaseMaterialInfoService;
-import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.wms.service.IWmsAllocateOrderDetailService;
-import org.dromara.common.core.exception.ServiceException;
+import org.dromara.wms.service.IWmsAllocateTaskService;
-import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
-import java.util.Date;
-import java.math.BigDecimal;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -457,4 +451,15 @@ public class WmsAllocateTaskServiceImpl implements IWmsAllocateTaskService {
     private String generateBatchCode(String allocateCode, String materialCode, String order) {
         return allocateCode + materialCode + order;
     }
+
+    @Override
+    public List<WmsAllocateTaskVo> allocateSelectCode(String code) {
+        MPJLambdaWrapper<WmsAllocateTask> lqw = JoinWrappers.lambda(WmsAllocateTask.class);
+        lqw.selectAll(WmsAllocateTask.class);
+        lqw.eq(WmsAllocateTask::getBatchCode, code)
+            .eq(WmsAllocateTask::getInboundStatus, "0")
+            .orderByDesc(WmsAllocateTask::getCreateTime);
+
+        return baseMapper.selectVoList(lqw);
+    }
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java

@@ -429,12 +429,13 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService {
     }
 
     @Override
-    public WmsInventoryVo selectOrderBeachCode(Long materialId) {
+    public List<WmsInventoryVo> selectOrderBeachCode(Long materialId) {
         LambdaQueryWrapper<WmsInventory> lqw = Wrappers.lambdaQuery();
         lqw.eq(WmsInventory::getMaterialId, materialId)
             .gt(WmsInventory::getInventoryQty, BigDecimal.ZERO)
             .eq(WmsInventory::getLockState, 0)
             .orderByAsc(WmsInventory::getCreateTime);
-        return baseMapper.selectVoOne(lqw);
+
+        return baseMapper.selectVoList(lqw);
     }
 }