1.PDA入库流程：（入库码盘->条码检测->上架->呼叫AGV）已完成

2.PDA托盘解绑bug修改完毕

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -213,8 +213,20 @@ public class PdaController {
     }
 
     /**
-     * 解绑物料
+     * 查询备货绑定
      *
+     * @param palletNo
+     * @return
+     */
+    @GetMapping("/docAsn/searchStock")
+    public AjaxResult searchStock(@RequestParam String palletNo, @RequestParam String sku) {
+        List<SearchStockVO> searchStockVOList = wmsDocAsnHeaderService.searchStockSkuSn(palletNo, sku);
+        return AjaxResult.success("", searchStockVOList);
+    }
+
+    /**
+     * 解绑物料
+     * PDA先执行-查询备货绑定
      * @param unlockForm
      * @return
      */
@@ -282,18 +294,6 @@ public class PdaController {
         List<WmsDocAsnDetails> detailsList = wmsDocAsnHeaderService.selectStockingList(stockingListForm.getAsnNoList());
         return AjaxResult.success(detailsList);
     }
-
-    /**
-     * 查询备货绑定
-     *
-     * @param palletNo
-     * @return
-     */
-    @GetMapping("/docAsn/searchStock")
-    public AjaxResult searchStock(@RequestParam String palletNo, @RequestParam String sku) {
-        List<SearchStockVO> searchStockVOList = wmsDocAsnHeaderService.searchStock(palletNo, sku);
-        return AjaxResult.success("", searchStockVOList);
-    }
     /*************************************************入库-END****************************************************/
 
 

ruoyi-ui/src/views/ams/inv/invLotLocId/index.vue

@@ -134,10 +134,10 @@
       <el-table-column type="selection" />
       <el-table-column label="库区" align="center" prop="zoneName"/>
       <el-table-column label="库位" align="center" prop="locationNo"/>
-      <el-table-column label="物料" align="center" prop="sku" width="200"/>
+      <el-table-column label="托盘号" align="center" prop="palletNo"/>
+      <el-table-column label="物料编号" align="center" prop="sku" width="200"/>
       <el-table-column label="物料名称" align="center" prop="skuName" width="200"/>
       <el-table-column label="物料种类" align="center" prop="skuTypeName"/>
-      <el-table-column label="托盘号" align="center" prop="palletNo"/>
       <el-table-column label="是否满拖" align="center" prop="isFull"/>
       <el-table-column label="库存数量" align="center" prop="qty"/>
       <el-table-column label="已分配数量" align="center" prop="qtyallocated" width="200"/>

warewms-ams/src/main/java/com/ruoyi/ams/asn/mapper/WmsDocAsnHeaderMapper.java

@@ -112,13 +112,22 @@ public interface WmsDocAsnHeaderMapper {
     WmsDocAsnDetails selectWmsDocDetailsOne(@Param("asnNo") String asnNo, @Param("asnLineNo") int asnLineNo);
 
     /**
-     * 查询码盘记录
+     * 查询码盘记录 产品
      *
      * @param palletNo
      * @return
      */
     List<SearchStockVO> searchStock(@Param("palletNo") String palletNo,@Param("sku") String sku);
 
+    /**
+     * 查询码盘记录 产品条码
+     *
+     * @param palletNo
+     * @param sku
+     * @return
+     */
+    List<SearchStockVO> searchStockSkuSn(@Param("palletNo") String palletNo,@Param("sku") String sku);
+
     /**
      * 根据入库单号和产品编号查询未接收数量
      *

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/IWmsDocAsnHeaderService.java

@@ -141,6 +141,14 @@ public interface IWmsDocAsnHeaderService {
      */
     List<SearchStockVO> searchStock(String palletNo, String sku);
 
+    /**
+     * 查询已码盘
+     *
+     * @param palletNo
+     * @return
+     */
+    List<SearchStockVO> searchStockSkuSn(String palletNo, String sku);
+
 
     /**
      * 检查关闭表头

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -297,7 +297,6 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                 throw new ServiceException("该托盘已放满");
             }
             wmsBoxInfo.setBoxState(1);//启用状态
-            wmsBoxInfo.setIsFull(stockForm.getFullTag());
             wmsBoxInfo.setLocationId(Long.parseLong(STAGE01));
             wmsBoxInfo.setUpdateBy(loginUser.getUsername());
             wmsBoxInfo.setUpdateTime(new Date());
@@ -512,7 +511,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             throw new ServiceException("托盘不存在");
         }
 
-        BaseLocationInfo locationTo = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(paForm.getLocationTo()));
+        BaseLocationInfo locationTo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(paForm.getLocationTo(),Constant.WAREHOUSE_ID);
         if (locationTo != null) {
             locationTo.setIsEmpty("N");
             baseLocationInfoService.updateBaseLocationInfo(locationTo);
@@ -530,7 +529,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             //更新库位状态
             //更新托盘库存到起始库位
             //invLotLocIdMapper.updateInvLotLocIdLocationId(Long.parseLong(inv.getLocationId()), Long.parseLong(paForm.getLocationTo()));
-            invLotLocIdMapper.updateInvLotLocIdToByLotnum(inv.getLotnum(), Long.parseLong(paForm.getLocationTo()));
+            invLotLocIdMapper.updateInvLotLocIdToByLotnum(inv.getLotnum(), locationTo.getId());
 
             WmsDocAsnDetails query = new WmsDocAsnDetails();
             query.setAsnNo(invLotAtt.getLotatt08());
@@ -548,7 +547,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             wmsDocAsnHeaderMapper.updateWmsDocAsnHeader(updateStatus);
         }
 
-        wmsBoxInfo.setLocationId(Long.parseLong(paForm.getLocationTo()));
+        wmsBoxInfo.setLocationId(locationTo.getId());
         int result = wmsBoxInfoService.updateWmsBoxInfo(wmsBoxInfo);
         if (result <= 0) {
             throw new ServiceException("托盘绑定更新失败");
@@ -616,6 +615,11 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         return wmsDocAsnHeaderMapper.searchStock(palletNo, sku);
     }
 
+    @Override
+    public List<SearchStockVO> searchStockSkuSn(String palletNo, String sku) {
+        return wmsDocAsnHeaderMapper.searchStockSkuSn(palletNo, sku);
+    }
+
     @Override
     public int closeHeader(String asnNo) {
         WmsDocAsnHeader wmsDocAsnHeader = wmsDocAsnHeaderMapper.selectWmsDocAsnHeaderByAsnNo(asnNo);

warewms-ams/src/main/resources/mapper/docAsn/WmsDocAsnHeaderMapper.xml

@@ -430,6 +430,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="searchStockSkuSn" resultMap="searchStockResult">
+        SELECT
+        inv.lotnum,
+        inv.location_id,
+        inv.customer_id,
+        inv.qty,
+        sk.sku,
+        sk.desc1 skuName,
+        sk.model,
+        att.lotatt02 sn,
+        sk.sku_type skuType,
+        skt.item_name skuTypeName,
+        att.*
+        FROM inv_lot_loc_id inv
+        Left JOIN inv_lot_att att on inv.lotnum = att.lotnum
+        LEFT JOIN wms_box_info w ON inv.location_id = w.location_id
+        LEFT JOIN base_sku sk ON inv.sku = sk.sku
+        LEFT JOIN base_sku_type skt ON sk.sku_type = skt.item_code
+        <where>
+            (w.box_no = #{palletNo} or att.lotatt07 = #{palletNo})
+            and att.lotatt02 = #{sku}
+        </where>
+    </select>
+
     <select id="selectReceivedQtyByAsnNos" resultType="double">
         select ifnull(sum(expected_qty),0) - ifnull(sum(received_qty),0) received_qty
         from wms_doc_asn_details