优化出库单分配代码

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

@@ -100,7 +100,7 @@ public class PdaController {
     private IBaseLocationInfoService baseLocationInfoService;
 
 
-    /*************************************************入库-START****************************************************/
+    //region PDA入库
 
     /**
      * 入库码盘
@@ -322,10 +322,12 @@ public class PdaController {
         List<WmsDocAsnDetails> detailsList = wmsDocAsnHeaderService.selectStockingList(stockingListForm.getAsnNoList());
         return AjaxResult.success(detailsList);
     }
-    /*************************************************入库-END****************************************************/
 
+    //endregion
 
-    /*************************************************出库-START****************************************************/
+
+
+    //region PDA出库
 
     /**
      * 出库单分配
@@ -460,11 +462,9 @@ public class PdaController {
         return AjaxResult.success(codeSkuRelationshipSoVO);
     }
 
-    /*************************************************出库-END****************************************************/
-
-
-    /*************************************************基础操作-Begin****************************************************/
+    //endregion
 
+    //region 基础操作
     /**
      * PDA扫码查询库位信息
      *
@@ -484,10 +484,10 @@ public class PdaController {
     public AjaxResult locationRelease(@RequestBody BasLocationForm basLocationForm) {
         return invLotLocIdService.releaseLocation(basLocationForm.getLocationNo(), Constant.WAREHOUSE_ID, "PDA");
     }
+    //endregion
 
 
 
-    /*************************************************基础操作-End***************************************************/
 
 
 

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

@@ -134,15 +134,21 @@
       <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="palletNo"/>
+<!--      <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="isFull"/>
       <el-table-column label="库存数量" align="center" prop="qty"/>
       <el-table-column label="已分配数量" align="center" prop="qtyallocated" width="200"/>
-      <el-table-column label="托盘号" align="center" prop="lotatt07" width="200"/>
-      <el-table-column label="入库单号" align="center" prop="lotatt08" width="200"/>
+<!--      <el-table-column label="托盘号" align="center" prop="lotatt07" width="200"/>-->
+<!--      <el-table-column label="入库单号" align="center" prop="lotatt08" width="200"/>-->
+      <el-table-column
+        v-for="(item, index) in tableOption"
+        :key="index"
+        :label="item.label"
+        align="center" :prop="item.prop" width="200">
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

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

@@ -225,7 +225,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         if (orderHeader == null) {
             return AjaxResult.error("没有查询到订单");
         }
-        if (!orderHeader.getOrderStatus().equals("00")) {
+        // TODO 改成可以部分分配
+        if (!orderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS00.getValue())) {
             return AjaxResult.error("出库单为创建状态才可以分配");
         }
         boolean isbf = false;
@@ -233,7 +234,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         BigDecimal total = BigDecimal.ZERO;
         List<WmsDocOrderDetails> orderDetails = orderHeader.getWmsDocOrderDetailsList();
         for (WmsDocOrderDetails o : orderDetails) {
-            total = total.add(o.getQtyOrdered());
+            total = total.add(o.getQtyOrdered().subtract(o.getQtyAllocated()));
         }
         for (WmsDocOrderDetails o : orderDetails) {
             AjaxResult result = wmsDocOrderHeaderService.doAllocationDetails(orderHeader, o);
@@ -249,12 +250,13 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             }
         }
         if (isbf) {
-            orderHeader.setOrderStatus("10");
+            orderHeader.setOrderStatus(Constant.ORDER_STS.STS10.getValue());
             wmsDocOrderHeaderService.updateWmsDocOrderHeader(orderHeader);
+            // TODO 改成可以部分分配
             throw new ServiceException("库存数量不足，分配失败！" + orderNo);
         }
         if (isAllocation) {
-            orderHeader.setOrderStatus("20");
+            orderHeader.setOrderStatus(Constant.ORDER_STS.STS20.getValue());
             wmsDocOrderHeaderService.updateWmsDocOrderHeader(orderHeader);
             return AjaxResult.success("分配成功");
         } else {
@@ -278,10 +280,18 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return AjaxResult.success("分配成功");
     }
 
+    /**
+     * 每次分配只能进入一条线程
+     *
+     * @param header
+     * @param details
+     * @return
+     */
     @Transactional
     @Override
-    public AjaxResult doAllocationDetails(WmsDocOrderHeader header, WmsDocOrderDetails details) {
-        if (!details.getLineStatus().equals("00")) {
+    public synchronized AjaxResult doAllocationDetails(WmsDocOrderHeader header, WmsDocOrderDetails details) {
+        // TODO 改成可以部分分配
+        if (!details.getLineStatus().equals(Constant.ORDER_STS.STS00.getValue())) {
             return AjaxResult.error("出库明细为创建状态才可以分配！");
         }
         LotattDTO lotattDTO = new LotattDTO();
@@ -290,16 +300,17 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             lotattDTO.setLotatt14(header.getOrderNo());
         }
         List<InvLotLocId> invList = invLotLocIdService.queryInvOrderBy(details.getLotnum(), details.getSku(), details.getLocation(), Constant.CUSTOMER_ID, lotattDTO);
-        // 原始订单数
-        BigDecimal originalOrderQty = details.getQtyOrdered();
-        //库存可分配数小于订单数
-        BigDecimal orderQty = details.getQtyOrdered();
-        //判断总数是否足够分配
+        // 原始订单需分配数
+        BigDecimal originalOrderQty = details.getQtyOrdered().subtract(details.getQtyAllocated());
+        // 订单需分配数
+        BigDecimal orderQty = details.getQtyOrdered().subtract(details.getQtyAllocated());
+        // 判断匹配库存总数是否足够分配
         double qtySum = invList.stream()
                 .mapToDouble(item -> item.getQty().doubleValue() > item.getQtyallocated().doubleValue()
                         ? item.getQty().doubleValue() - item.getQtyallocated().doubleValue() : 0)
                 .sum();
         if (qtySum < orderQty.doubleValue()) {
+            // TODO 改成可以部分分配
             return AjaxResult.error("库存不足分配失败");
         }
         for (InvLotLocId inv : invList) {
@@ -315,6 +326,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             BigDecimal canallocatedQty = inv.getQty().subtract(inv.getQtyallocated());
             if (canallocatedQty.doubleValue() > 0) {
                 if (inv.getQty().intValue() > 0) {
+                    // 当前库存可分配数量 < 订单需分配数
                     if (inv.getQty().subtract(inv.getQtyallocated()).compareTo(orderQty) == -1) {
                         //可以分配的库存
                         BigDecimal allocatedQty = inv.getQty().subtract(inv.getQtyallocated());
@@ -325,16 +337,15 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                             //修改出库单状态
                             details.setQtyAllocated(details.getQtyAllocated().add(allocatedQty));
                             details.setQtyAllocatedEach(details.getQtyAllocated());
-                            details.setLineStatus("20");
+                            details.setLineStatus(Constant.ORDER_STS.STS10.getValue());
                             wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(details);
-
-//                            header.setOrderStatus("10");
-//                            wmsDocOrderHeaderService.updateWmsDocOrderHeader(header);
                             //生成分配明细
-                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), allocatedQty, details, "20");
+                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), allocatedQty, details
+                                    , Constant.ORDER_STS.STS20.getValue());
                         } else {
                             throw new ServiceException("占用库存分配数失败");
                         }
+                        // 当前库存可分配数量 = 订单需分配数
                     } else if (inv.getQty().subtract(inv.getQtyallocated()).compareTo(orderQty) == 0) {
                         //可以分配的库存
                         BigDecimal allocatedQty = inv.getQty().subtract(inv.getQtyallocated());
@@ -343,34 +354,31 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                         if (invLotLocIdService.updateInvLotLocId(inv) > 0) {
                             orderQty = orderQty.subtract(allocatedQty);
                             //修改出库单状态
-                            //修改出库单状态
-                            details.setLineStatus("20");
+                            details.setLineStatus(Constant.ORDER_STS.STS20.getValue());
                             details.setQtyAllocated(details.getQtyAllocated().add(allocatedQty));
                             details.setQtyAllocatedEach(details.getQtyAllocatedEach().add(allocatedQty));
                             wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(details);
-
-//                            header.setOrderStatus("20");
-//                            wmsDocOrderHeaderService.updateWmsDocOrderHeader(header);
                             //生成分配明细
-                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), allocatedQty, details, "20");
+                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), allocatedQty, details
+                                    , Constant.ORDER_STS.STS20.getValue());
                             return AjaxResult.success("分配完成", originalOrderQty);
                         } else {
                             throw new ServiceException("占用库存分配数失败");
                         }
+                        // 当前库存可分配数量 > 订单需分配数
                     } else {
                         BigDecimal currentQty = orderQty;
                         inv.setQtyallocated(inv.getQtyallocated().add(currentQty));
                         inv.setQtyallocatedEach(inv.getQtyallocatedEach().add(currentQty));
-                        details.setQtyAllocatedEach(details.getQtyAllocatedEach().add(currentQty));
                         if (invLotLocIdService.updateInvLotLocId(inv) > 0) {
                             //修改出库单状态
-                            details.setLineStatus("20");
+                            details.setLineStatus(Constant.ORDER_STS.STS20.getValue());
                             details.setQtyAllocated(details.getQtyAllocated().add(currentQty));
+                            details.setQtyAllocatedEach(details.getQtyAllocatedEach().add(currentQty));
                             wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(details);
-//                            header.setOrderStatus("20");
-//                            wmsDocOrderHeaderService.updateWmsDocOrderHeader(header);
                             //生成分配明细
-                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), currentQty, details, "10");
+                            actAllocationDetailsService.addActAllocationDetails(inv.getLotnum(), inv.getLocationId(), currentQty, details
+                                    , Constant.ORDER_STS.STS20.getValue());
                             return AjaxResult.success("分配完成", originalOrderQty);
 
                         } else {

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

@@ -492,7 +492,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="queryInvOrderBy" parameterType="InvLotLocId" resultMap="InvLotLocIdResult">
-        select inv.* from inv_lot_loc_id inv
+        select inv.*
+        from inv_lot_loc_id inv
         left join base_location_info b on inv.location_id = b.id
         left join inv_lot_att att on inv.lotnum = att.lotnum
         <where>