bug修复

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

@@ -232,12 +232,12 @@ public class PadController {
         return wmsDocOrderHeaderService.doPick(pickForm.getPickInfoFormList());
     }
 
-    @PostMapping("/docOrder/doCheckout")
+    /*@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/java/com/ruoyi/web/controller/warewms/wms/asn/WmsDocAsnHeaderController.java

@@ -2,9 +2,11 @@ package com.ruoyi.web.controller.warewms.wms.asn;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
+import com.ruoyi.ams.asn.service.IWmsDocAsnDetailsService;
 import com.ruoyi.base.service.SysIdsequenceService;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,6 +41,8 @@ public class WmsDocAsnHeaderController extends BaseController {
     private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
     @Autowired
     private SysIdsequenceService sysIdsequenceService;
+    @Autowired
+    private IWmsDocAsnDetailsService wmsDocAsnDetailsService;
 
     /**
      * 查询入库单列表
@@ -126,7 +130,6 @@ public class WmsDocAsnHeaderController extends BaseController {
         return toAjax(result);
     }
 
-
     /**
      * 新增入库单明细
      */
@@ -166,4 +169,12 @@ public class WmsDocAsnHeaderController extends BaseController {
         WmsDocAsnHeader header = wmsDocAsnHeaderService.selectWmsDocAsnHeaderByAsnNo(asnNo);
         return AjaxResult.success("", header);
     }
+
+    @PostMapping(value = "/delDocAsnDetails")
+    public AjaxResult delDocAsnDetails(@RequestBody Map<String, Object> param) {
+        String asnNo = param.get("asnNo").toString();
+        Long asnLineNo = Long.parseLong(param.get("asnLineNo").toString());
+        return toAjax(wmsDocAsnDetailsService.deleteWmsDocAsnDetailsByAsnNoLineNo(asnNo, asnLineNo));
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/WmsDocOrderHeaderController.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.form.AllocationForm;
 import com.ruoyi.base.service.SysIdsequenceService;
@@ -150,4 +151,17 @@ public class WmsDocOrderHeaderController extends BaseController {
     public AjaxResult doAllocation(@RequestBody AllocationForm allocationForm) {
         return wmsDocOrderHeaderService.doAllocation(allocationForm.getOrderNo());
     }
+
+    /**
+     * 新增出库单明细
+     */
+    @PreAuthorize("@ss.hasPermi('docAsn:docAsn:add')")
+    @Log(title = "出库明细", businessType = BusinessType.INSERT)
+    @PostMapping("addDocOrderDetails")
+    public AjaxResult addDocOrderDetails(@RequestBody WmsDocOrderDetails wmsDocOrderDetails) {
+        LoginUser loginUser = getLoginUser();
+        wmsDocOrderDetails.setCreateBy(loginUser.getUsername());
+        wmsDocOrderDetails.setCreateTime(new Date());
+        return toAjax(wmsDocOrderHeaderService.insertWmsDocOrderDetails(wmsDocOrderDetails));
+    }
 }

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

@@ -61,6 +61,14 @@ public interface WmsDocAsnDetailsMapper
      */
      int deleteWmsDocAsnDetailsByAsnLineNos(Long[] asnLineNos);
 
+    /**
+     * 删除明细根据asnNo和lineNo
+     * @param asnNo
+     * @param asnLineNo
+     * @return
+     */
+    int deleteWmsDocAsnDetailsByAsnNoLineNo(@Param("asnNo") String asnNo,@Param("asnLineNo") Long asnLineNo);
+
     /**
      * 更新接收数
      * @param asnNo

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

@@ -66,4 +66,6 @@ public interface IWmsDocAsnDetailsService
      * @return 结果
      */
      int deleteWmsDocAsnDetailsByAsnLineNo(Long asnLineNo);
+
+     int deleteWmsDocAsnDetailsByAsnNoLineNo(String asnNo,Long asnLineNo);
 }

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

@@ -107,4 +107,9 @@ public class WmsDocAsnDetailsServiceImpl implements IWmsDocAsnDetailsService
     {
         return wmsDocAsnDetailsMapper.deleteWmsDocAsnDetailsByAsnLineNo(asnLineNo);
     }
+
+    @Override
+    public int deleteWmsDocAsnDetailsByAsnNoLineNo(String asnNo, Long asnLineNo) {
+        return wmsDocAsnDetailsMapper.deleteWmsDocAsnDetailsByAsnNoLineNo(asnNo, asnLineNo);
+    }
 }

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

@@ -83,10 +83,10 @@ public interface IWmsDocOrderHeaderService {
     /**
      * 更新订单明细备货数
      *
-     * @param orderNo 订单号
+     * @param orderNo     订单号
      * @param orderLoneNo 订单明细
-     * @param sku 物料
-     * @param qty 数量
+     * @param sku         物料
+     * @param qty         数量
      * @return
      */
     int updateOrderDetailsStock(String orderNo, Long orderLoneNo, String sku, Double qty);
@@ -117,6 +117,7 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 拣货分拣
+     *
      * @param pickFormList
      * @return
      */
@@ -124,12 +125,14 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 分拣出库
+     *
      * @return
      */
     AjaxResult doCheckout(List<CheckOutInfoForm> checkOutForms);
 
     /**
      * 发运
+     *
      * @param orderNo
      * @return
      */
@@ -137,8 +140,16 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 查询待出库明细
+     *
      * @param palletNo
      * @return
      */
     List<StockOrderVO> selectStockOrder(String palletNo);
+
+    /**
+     * 新增出库单明细
+     * @param wmsDocOrderDetails
+     * @return
+     */
+    int insertWmsDocOrderDetails(WmsDocOrderDetails wmsDocOrderDetails);
 }

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

@@ -315,4 +315,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     public List<StockOrderVO> selectStockOrder(String palletNo) {
         return wmsDocOrderDetailsMapper.selectStockOrder(palletNo);
     }
+
+    @Override
+    public int insertWmsDocOrderDetails(WmsDocOrderDetails wmsDocOrderDetails) {
+        return wmsDocOrderDetailsMapper.insertWmsDocOrderDetails(wmsDocOrderDetails);
+    }
 }

warewms-ams/src/main/resources/mapper/ams/WmsDocAsnDetailsMapper.xml

@@ -300,6 +300,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <delete id="deleteWmsDocAsnDetailsByAsnNoLineNo">
+        delete from wms_doc_asn_details where asn_no = #{asnNo} and asn_line_no = #{asnLineNo}
+    </delete>
+
     <update id="updateWmsReceivedQty">
         update wms_doc_asn_details set received_qty += #{qty},asn_status = #{asnStatus} where asn_no = #{asnNo} and asn_line_no = #{asnLineNo}
     </update>