分拣

warewms-ams/src/main/java/com/ruoyi/ams/order/form/PickForm.java

@@ -0,0 +1,17 @@
+package com.ruoyi.ams.order.form;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/11/4
+ * Description:
+ */
+@Data
+public class PickForm {
+    private String palletNo;
+    private List<PickInfoForm> pickInfoList;
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/form/PickInfoForm.java

@@ -0,0 +1,13 @@
+package com.ruoyi.ams.order.form;
+
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/11/4
+ * Description:
+ */
+public class PickInfoForm {
+    private Long allocationId;
+    private String qty;
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/mapper/ActAllocationDetailsMapper.java

@@ -58,4 +58,11 @@ public interface ActAllocationDetailsMapper
      * @return 结果
      */
      int deleteActAllocationDetailsByAllocationIds(String[] allocationIds);
+
+    /**
+     * 根据托盘编号查询分配记录
+     * @param palletNo
+     * @return
+     */
+     List<ActAllocationDetails> queryAllocationDetailsByPalletNo(String palletNo);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IActAllocationDetailsService.java

@@ -80,4 +80,12 @@ public interface IActAllocationDetailsService {
      * @return
      */
     AjaxResult addActAllocationDetails(String lotnum, String locationId, BigDecimal qty, WmsDocOrderDetails orderDetails);
+
+    /**
+     * 根据托盘编号查询分配明细
+     *
+     * @param palletNo
+     * @return
+     */
+    List<ActAllocationDetails> queryAllocationDetailsByPalletNo(String palletNo);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderHeaderService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.form.PickForm;
 import com.ruoyi.common.core.domain.AjaxResult;
 
 /**
@@ -69,6 +70,25 @@ public interface IWmsDocOrderHeaderService {
      */
     int deleteWmsDocOrderHeaderByOrderNo(String orderNo);
 
+    /**
+     * 初始化表体
+     *
+     * @param orderNo
+     * @return
+     */
+    List<WmsDocOrderDetails> initOrderDetails(String orderNo);
+
+    /**
+     * 更新订单明细备货数
+     *
+     * @param orderNo
+     * @param orderLoneNo
+     * @param sku
+     * @param qty
+     * @return
+     */
+    int updateOrderDetailsStock(String orderNo, Long orderLoneNo, String sku, Double qty);
+
     /**
      * 拣货分配
      *
@@ -79,32 +99,24 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 多单分配
+     *
      * @param orderNoList
      * @return
      */
     AjaxResult doAllocation(List<String> orderNoList);
 
     /**
-     * 按明细分配
+     * 拣货分配(按明细分配)
+     *
      * @param details
      * @return
      */
-    AjaxResult doAllocationDetails(WmsDocOrderHeader header,WmsDocOrderDetails details);
-
-    /**
-     * 初始化表体
-     * @param orderNo
-     * @return
-     */
-    List<WmsDocOrderDetails> initOrderDetails(String orderNo);
+    AjaxResult doAllocationDetails(WmsDocOrderHeader header, WmsDocOrderDetails details);
 
     /**
-     * 更新订单明细备货数
-     * @param orderNo
-     * @param orderLoneNo
-     * @param sku
-     * @param qty
+     * 拣货分拣
+     * @param pickForm
      * @return
      */
-    int updateOrderDetailsStock(String orderNo,Long orderLoneNo,String sku, Double qty);
+    AjaxResult doPick(PickForm pickForm);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/ActAllocationDetailsServiceImpl.java

@@ -126,4 +126,9 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
             return AjaxResult.error("分配明细生成失败");
         }
     }
+
+    @Override
+    public List<ActAllocationDetails> queryAllocationDetailsByPalletNo(String palletNo) {
+        return actAllocationDetailsMapper.queryAllocationDetailsByPalletNo(palletNo);
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
+import com.ruoyi.ams.order.form.PickForm;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -58,6 +59,19 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return wmsDocOrderHeaderMapper.selectWmsDocOrderHeaderList(wmsDocOrderHeader);
     }
 
+    @Override
+    public List<WmsDocOrderDetails> initOrderDetails(String orderNo) {
+        WmsDocOrderDetails query = new WmsDocOrderDetails();
+        query.setOrderNo(orderNo);
+        List<WmsDocOrderDetails> details = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsList(query);
+        return details;
+    }
+
+    @Override
+    public int updateOrderDetailsStock(String orderNo, Long orderLoneNo, String sku, Double qty) {
+        return wmsDocOrderDetailsMapper.updateOrderDetailsStock(orderNo, orderLoneNo, sku, qty);
+    }
+
     /**
      * 查询出库单头
      *
@@ -237,15 +251,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     }
 
     @Override
-    public List<WmsDocOrderDetails> initOrderDetails(String orderNo) {
-        WmsDocOrderDetails query = new WmsDocOrderDetails();
-        query.setOrderNo(orderNo);
-        List<WmsDocOrderDetails> details = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsList(query);
-        return details;
-    }
-
-    @Override
-    public int updateOrderDetailsStock(String orderNo, Long orderLoneNo, String sku, Double qty) {
-        return wmsDocOrderDetailsMapper.updateOrderDetailsStock(orderNo, orderLoneNo, sku, qty);
+    public AjaxResult doPick(PickForm pickForm) {
+        return null;
     }
 }

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -126,4 +126,9 @@
             #{allocationId}
         </foreach>
     </delete>
+
+    <select id="queryAllocationDetailsByPalletNo" parameterType="String" resultMap="ActAllocationDetailsResult">
+        select al.* from act_allocation_details al left join wms_box_info b on al.location_id = b.location_id
+        where al.box_no = #{palletNo}
+    </select>
 </mapper>