From 4f3063716768928709fe6440790fe349f68a85c9 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 25 Feb 2025 14:54:55 +0800
Subject: [PATCH] 20250225

---
 .../xujie/sys/modules/pms/entity/PurchaseOrder.java  |  2 ++
 .../pms/service/Impl/PurchaseOrderServiceImpl.java   | 12 ++++++++----
 .../resources/mapper/pms/InventoryStockMapper.xml    | 12 ++++++------
 .../resources/mapper/pms/PurchaseOrderMapper.xml     |  2 ++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java b/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java
index c1c1963f..15b08dca 100644
--- a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java
+++ b/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrder.java
@@ -38,6 +38,8 @@ public class PurchaseOrder {
 
     private String purchaseOrderNo;
 
+    private BigDecimal quantityOfArrival;
+
 
     @TableField(exist = false)
     private String partDescription;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PurchaseOrderServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PurchaseOrderServiceImpl.java
index 8f0f43f1..8d2d16fe 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PurchaseOrderServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PurchaseOrderServiceImpl.java
@@ -39,6 +39,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         // set参数
         String username = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername();
         purchaseOrder.setPurchaseOrderNo(queryPurchaseOrderNo(purchaseOrder));
+        purchaseOrder.setQuantityOfArrival(BigDecimal.ZERO);
         purchaseOrder.setStatus("进行中");
         purchaseOrder.setCreateBy(username);
         purchaseOrder.setCreateTime(new Date());
@@ -76,6 +77,9 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Transactional
     public void cancelPurchaseOrder(PurchaseOrder purchaseOrder) {
         checkPurchaseOrder(purchaseOrder);
+        if (purchaseOrder.getQuantityOfArrival().compareTo(BigDecimal.ZERO) > 0){
+            throw new RuntimeException("该备品备件采购单已存在入库数量!");
+        }
         // 修改状态
         lambdaUpdate()
                 .set(PurchaseOrder::getStatus,"已取消")
@@ -98,10 +102,10 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                 .eq(PurchaseOrder::getId,purchaseOrder.getId())
                 .update();
         // 修改库存数量
-        InventoryStockEntity inventoryStockEntity = new InventoryStockEntity();
-        inventoryStockEntity.setId(purchaseOrder.getInventoryStockId());
-        inventoryStockEntity.setQtyOfPo(purchaseOrder.getQty().floatValue());
-        inventoryStockService.updateQtyOfPoByIdOfSub(inventoryStockEntity);
+//        InventoryStockEntity inventoryStockEntity = new InventoryStockEntity();
+//        inventoryStockEntity.setId(purchaseOrder.getInventoryStockId());
+//        inventoryStockEntity.setQtyOfPo(purchaseOrder.getQty().floatValue());
+//        inventoryStockService.updateQtyOfPoByIdOfSub(inventoryStockEntity);
     }
 
     private void checkPurchaseOrder(PurchaseOrder purchaseOrder) {
diff --git a/src/main/resources/mapper/pms/InventoryStockMapper.xml b/src/main/resources/mapper/pms/InventoryStockMapper.xml
index 99a08530..ef355505 100644
--- a/src/main/resources/mapper/pms/InventoryStockMapper.xml
+++ b/src/main/resources/mapper/pms/InventoryStockMapper.xml
@@ -102,12 +102,6 @@
             <if test="query.safetyStock == '安全'">
                 and A.qty_on_hand <![CDATA[>]]> B.min_stock
             </if>
-            <if test="query.safetyStock == '不安全' and (query.securityMethod == '库存' or query.securityMethod == '' or query.securityMethod == null )">
-                and A.qty_on_hand <![CDATA[<=]]> B.min_stock
-            </if>
-            <if test="query.safetyStock == '不安全' and query.securityMethod == '库存和在途'">
-                and A.qty_on_hand + isnull(A.qty_of_po,0.0) <![CDATA[<=]]> B.min_stock
-            </if>
         </where>
         GROUP BY
         <if test="query.groupType == 0">
@@ -116,6 +110,12 @@
         <if test="query.groupType == 1">
             A.site, A.part_no, B.part_description, b.min_stock, b.max_stock, B.average_price, B.umid,a.citem_code
         </if>
+        <if test="query.safetyStock == '不安全' and (query.securityMethod == '库存' or query.securityMethod == '' or query.securityMethod == null )">
+            having sum(A.qty_on_hand) <![CDATA[<=]]> B.min_stock
+        </if>
+        <if test="query.safetyStock == '不安全' and query.securityMethod == '库存和在途'">
+            having sum(A.qty_on_hand) + sum(isnull(A.qty_of_po,0.0)) <![CDATA[<=]]> B.min_stock
+        </if>
     </select>
 
     <update id="updateQtyOfPoByIdOfAdd">
diff --git a/src/main/resources/mapper/pms/PurchaseOrderMapper.xml b/src/main/resources/mapper/pms/PurchaseOrderMapper.xml
index 8fa84f00..682db3bc 100644
--- a/src/main/resources/mapper/pms/PurchaseOrderMapper.xml
+++ b/src/main/resources/mapper/pms/PurchaseOrderMapper.xml
@@ -14,6 +14,7 @@
                po.create_by,
                po.create_time,
                po.purchase_order_no,
+               po.quantity_of_arrival,
                ps.part_description,
                ps.umid,
                dbo.get_bu_desc(po.site, po.bu_no) as bu_desc
@@ -44,6 +45,7 @@
                 and po.create_time <![CDATA[<=]]> #{params.endDate}
             </if>
         </where>
+        order by po.id desc
     </select>
 
     <select id="queryPurchaseOrderNo" resultType="java.lang.String">