待入库 添加已入库数量 入库状态结束入库

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/vo/ArrivalDetailVo.java

@@ -27,4 +27,13 @@ public class ArrivalDetailVo extends ArrivalDetail {
 
     private Date arrivalTime;
 
+    /**
+     * 入库数量
+     */
+    private BigDecimal receiptQuantity;
+    /**
+     * 入库状态
+     */
+    private BigDecimal receiptStatus;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalServiceImpl.java

@@ -112,6 +112,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         stockWait.setStatus(0);
         stockWait.setPurchaseId(purchase.getId());
         stockWait.setContractId(purchase.getDataResourceId());
+        stockWait.setArrivalId(dto.getId());
         stockWaitService.save(stockWait);
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
 
@@ -143,6 +144,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             stockWaitDetails.setQuantity(arrivalDetail.getQuantity());
             stockWaitDetails.setStatus(0);
 
+            stockWaitDetails.setArrivalDetailId(arrivalDetail.getId());
+
             stockWaitDetailsList.add(stockWaitDetails);
         }
         arrivalDetailService.saveBatch(arrivalDetailList);

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -784,7 +784,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
 
         List<EhsdPurchaseProductVo> list = ehsdPurchaseProductMapper.getList(IWrapper.<EhsdPurchaseProduct>getWrapper()
                 .eq("epp", EhsdPurchaseProduct::getPurchaseId, id)
-                .apply("epp.arrivalQuantity < epp.quantity")
+                .apply("t1.receiptQuantity < epp.quantity")
         );
         if (list.size() > 0) {
             status = 1;//部分到货

hx-sale/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -3,17 +3,21 @@
 <mapper namespace="com.fjhx.sale.mapper.arrival.ArrivalDetailMapper">
     <select id="getList" resultType="com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo">
         SELECT ad.*,
-               a.arrival_time AS arrivalTime,
-               a.`code`       AS arrivalCode,
-               pi.`name`      AS productName,
-               pi.custom_code AS productCode,
-               pi.length      AS productLength,
-               pi.width       AS productWidth,
-               pi.height      AS productHeight,
-               pi.color       AS productColor
+               a.arrival_time       AS arrivalTime,
+               a.`code`             AS arrivalCode,
+               pi.`name`            AS productName,
+               pi.custom_code       AS productCode,
+               pi.length            AS productLength,
+               pi.width             AS productWidth,
+               pi.height            AS productHeight,
+               pi.color             AS productColor,
+               swd.receipt_quantity AS receiptQuantity,
+               sw.`status`          AS receiptStatus
         FROM arrival_detail ad
                  JOIN arrival a ON ad.arrival_id = a.id
                  LEFT JOIN product_info pi ON ad.product_id = pi.id
+                 LEFT JOIN stock_wait_details swd ON swd.arrival_detail_id = ad.id
+                 LEFT JOIN stock_wait sw ON swd.stock_wait_id = sw.id
             ${ew.customSqlSegment}
     </select>
 </mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -109,34 +109,38 @@
         GROUP BY epp.product_id
     </select>
     <select id="getList" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo">
-        SELECT *
-        FROM (SELECT ep.`code`                               AS purchaseCode,
-                     ep.create_time,
-                     epp.id,
-                     epp.tenant_id,
-                     epp.purchase_id,
-                     epp.product_id,
-                     epp.product_name,
-                     epp.product_model,
-                     epp.quantity,
-                     epp.exceed_quantity,
-                     epp.price,
-                     epp.amount,
-                     epp.remark,
-                     epp.create_user,
-                     epp.update_user,
-                     epp.update_time,
-                     epp.data_resource,
-                     epp.data_resource_id,
-                     epp.contract_id,
-                     epp.subscribe_detail_id,
-                     epp.old_purchase_product_id,
-                     (SELECT IFNULL(sum(swd.receipt_quantity), 0)
-                      FROM stock_wait_details swd
-                      WHERE swd.purchase_detail_id = epp.id) AS arrivalQuantity,
-                     ep.sell_corporation_id
-              FROM ehsd_purchase_product epp
-                       LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id) epp
+        SELECT ep.`code`                     AS purchaseCode,
+               ep.create_time,
+               epp.id,
+               epp.tenant_id,
+               epp.purchase_id,
+               epp.product_id,
+               epp.product_name,
+               epp.product_model,
+               epp.quantity,
+               epp.exceed_quantity,
+               epp.price,
+               epp.amount,
+               epp.remark,
+               epp.create_user,
+               epp.update_user,
+               epp.update_time,
+               epp.data_resource,
+               epp.data_resource_id,
+               epp.contract_id,
+               epp.subscribe_detail_id,
+               epp.old_purchase_product_id,
+               IFNULL(t1.receiptQuantity, 0) AS arrivalQuantity,
+               IFNULL(t1.receiptStatus, 0)   AS receiptStatus,
+               ep.sell_corporation_id
+        FROM ehsd_purchase_product epp
+                 LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id
+                 LEFT JOIN (SELECT swd.purchase_detail_id,
+                                   sw.`status`                          AS receiptStatus,
+                                   IFNULL(sum(swd.receipt_quantity), 0) AS receiptQuantity
+                            FROM stock_wait_details swd
+                                     JOIN stock_wait sw ON swd.stock_wait_id = sw.id
+                            GROUP BY swd.purchase_detail_id) t1 ON t1.purchase_detail_id = epp.id
             ${ew.customSqlSegment}
     </select>
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java

@@ -52,4 +52,12 @@ public class StockWaitController {
         stockWaitService.add(stockWaitDto);
     }
 
+    /**
+     * 结束入库
+     */
+    @PostMapping("/endStorage")
+    public void endStorage(@RequestBody BaseSelectDto dto) {
+        stockWaitService.endStorage(dto.getId());
+    }
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -63,4 +63,9 @@ public class StockWait extends BasePo {
      */
     private Long prodOrderId;
 
+    /**
+     * 到货id
+     */
+    private Long arrivalId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -75,4 +75,9 @@ public class StockWaitDetails extends BasePo {
      */
     private Long prodOrderId;
 
+    /**
+     * 到货明细id
+     */
+    private Long arrivalDetailId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockWaitService.java

@@ -44,4 +44,9 @@ public interface StockWaitService extends BaseService<StockWait> {
     void delete(Long id);
 
     void updateStatus(Long id);
+
+    /**
+     * 结束入库
+     */
+    void endStorage(Long id);
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -25,6 +25,7 @@ import com.fjhx.wms.service.WmsService;
 import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -327,4 +328,14 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         this.updateById(stockWait);
     }
 
+    @Override
+    public void endStorage(Long id) {
+        this.update(q -> q
+                .eq(StockWait::getId, id)
+                .set(StockWait::getStatus, 2)
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                .set(BasePo::getUpdateTime, new Date())
+        );
+    }
+
 }