pda接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/api/PadController.java

@@ -19,6 +19,8 @@ import com.ruoyi.ams.lineCall.domain.form.LineCallListFrom;
 import com.ruoyi.ams.lineCall.domain.vo.LineCallVO;
 import com.ruoyi.ams.lineCall.service.ILineCallService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
+import com.ruoyi.ams.order.form.CheckOutForm;
+import com.ruoyi.ams.order.form.CheckOutInfoForm;
 import com.ruoyi.ams.order.form.PickForm;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
@@ -230,5 +232,12 @@ public class PadController {
         return wmsDocOrderHeaderService.doPick(pickForm.getPickInfoFormList());
     }
 
-
+    @PostMapping("/docOrder/doCheckout")
+    public AjaxResult doCheckout(@RequestBody CheckOutForm checkOutForm) {
+        List<CheckOutInfoForm> checkOutInfoFormList = checkOutForm.getCheckOutInfoFormList();
+        if (checkOutForm.getCheckOutInfoFormList() == null || checkOutForm.getCheckOutInfoFormList().size() == 0) {
+            return AjaxResult.error("参数不能为空");
+        }
+        return wmsDocOrderHeaderService.doCheckout(checkOutInfoFormList);
+    }
 }

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

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.101.169.124:3306/warewms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.101.169.124:3306/warewms-yonghu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源

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

@@ -2,16 +2,9 @@ package com.ruoyi.ams.order.form;
 
 import lombok.Data;
 
-/**
- * Created by IntelliJ IDEA.
- * User: andy.qu
- * Date: 2022/11/7
- * Description:
- */
+import java.util.List;
+
 @Data
 public class CheckOutForm {
-    private String orderNo;
-    private Long orderLineNo;
-    private Long actAllocationId;
-    private String locationTo;
-}
+    private List<CheckOutInfoForm> checkOutInfoFormList;
+}

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

@@ -0,0 +1,17 @@
+package com.ruoyi.ams.order.form;
+
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/11/7
+ * Description:
+ */
+@Data
+public class CheckOutInfoForm {
+    private String orderNo;
+    private Long orderLineNo;
+    private Long actAllocationId;
+    private String locationTo;
+}

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

@@ -4,7 +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.CheckOutForm;
+import com.ruoyi.ams.order.form.CheckOutInfoForm;
 import com.ruoyi.ams.order.form.PickInfoForm;
 import com.ruoyi.ams.order.vo.StockOrderVO;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -126,7 +126,7 @@ public interface IWmsDocOrderHeaderService {
      * 分拣出库
      * @return
      */
-    AjaxResult doCheckout(List<CheckOutForm> checkOutForms);
+    AjaxResult doCheckout(List<CheckOutInfoForm> checkOutForms);
 
     /**
      * 发运

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

@@ -9,7 +9,7 @@ import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 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.CheckOutForm;
+import com.ruoyi.ams.order.form.CheckOutInfoForm;
 import com.ruoyi.ams.order.form.PickInfoForm;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
@@ -278,7 +278,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     }
 
     @Override
-    public AjaxResult doCheckout(List<CheckOutForm> checkOutForms) {
+    public AjaxResult doCheckout(List<CheckOutInfoForm> checkOutForms) {
         //TODO 生成任务呼叫到接驳位
 
         return null;

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

@@ -129,7 +129,7 @@
 
     <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}
+        where b.box_no = #{palletNo}
     </select>
 
     <select id="queryAllocationDetailsByOrderNo" parameterType="String" resultMap="ActAllocationDetailsResult">

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -136,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEmpty != null  and isEmpty != ''"> and is_empty = #{isEmpty}</if>
             <if test="locationType != null  and locationType != ''"> and location_type = #{locationType}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectBaseLocationInfoByLocationNo" parameterType="BaseLocationInfo" resultMap="BaseLocationInfoResult">