Bläddra i källkod

库存移动(差下发任务) --ing

k 2 år sedan
förälder
incheckning
9f6b41d0cf

+ 8 - 0
warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotLocIdService.java

@@ -30,6 +30,14 @@ public interface IInvLotLocIdService {
      */
     InvLotLocId selectInvLotLocIdByLotnum(String lotnum);
 
+    /**
+     * 查询库位库存信息列表
+     *
+     * @param locationId
+     * @return
+     */
+    List<InvLotLocId> selectInvLotLocIdList(String locationId);
+
     /**
      * 查询库位库存信息列表
      *

+ 15 - 3
warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -10,7 +10,6 @@ import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.mapper.InvLotAttMapper;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
-import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.SysIdsequenceService;
@@ -54,6 +53,19 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         return invLotLocIdMapper.selectInvLotLocIdByLotnum(lotnum);
     }
 
+    /**
+     * 查询库位库存信息列表
+     *
+     * @param locationId
+     * @return 库位库存信息
+     */
+    @Override
+    public List<InvLotLocId> selectInvLotLocIdList(String locationId) {
+        InvLotLocId invLotLocId = new InvLotLocId();
+        invLotLocId.setLocationId(locationId);
+        return invLotLocIdMapper.selectInvLotLocIdList(invLotLocId);
+    }
+
     /**
      * 查询库位库存信息列表
      *
@@ -166,9 +178,9 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         baseLocationFrom = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(locationFrom, warehouseId);
         baseLocationTo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(locationTo, warehouseId);
 
-        // 下发移库任务
+        // todo 下发移库任务
 
-        // 更新起始和目标库位状态
+        // 锁定起始和目标库位任务状态
         baseLocationInfoService.lockLocationStockStatus(baseLocationFrom.getId(), baseLocationTo.getId()
                 , warehouseId, updateBy);
 

+ 1 - 0
warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -121,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInvLotLocIdList" parameterType="InvLotLocId" resultMap="InvLotLocIdResult">
         <include refid="selectInvLotLocIdVo"/>
         <where>
+            <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>
             <if test="traceid != null  and traceid != ''"> and traceid = #{traceid}</if>
         </where>
     </select>

+ 6 - 0
warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -9,6 +9,12 @@ public class Constant {
     public static final String CUSTOMER_ID = "default";
     public static final Long WAREHOUSE_ID = 1L;
 
+    /**
+     * 中间缓存位
+     * AGV作业搬运任务时候库存的虚拟库位
+     */
+    public static final String LOC_MIDDLE_CACHE = "middleCache";
+
     /**
      * 是否
      */