From 512643752e4049f84ed15c96c41984fea0c4a01d Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Mon, 15 Jul 2024 15:57:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/schedule/ScheduleMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index b5a66dc..cae83ce 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -16,7 +16,7 @@
                 and T.ItemNo= #{itemNo}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                AND op.OrderNo like '%' + #{orderNo} + '%'
+                AND T.OrderNo like '%' + #{orderNo} + '%'
             </if>
         </where>
         Order by T.EnteredDate DESC

From 73dd9df706be744690e49de9f69e6be16b7ca992 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 16 Jul 2024 10:42:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/base/dao/NormalSearchMapper.java | 13 +++++++++++++
 .../material/service/Impl/IssureSoServiceImpl.java  | 12 ++++++++++++
 .../resources/mapper/base/NormalSearchMapper.xml    |  8 ++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/main/java/com/spring/modules/base/dao/NormalSearchMapper.java b/src/main/java/com/spring/modules/base/dao/NormalSearchMapper.java
index 2f48d66..cd5cbd3 100644
--- a/src/main/java/com/spring/modules/base/dao/NormalSearchMapper.java
+++ b/src/main/java/com/spring/modules/base/dao/NormalSearchMapper.java
@@ -1,5 +1,6 @@
 package com.spring.modules.base.dao;
 
+import com.spring.modules.base.entity.InventoryStockRoll;
 import com.spring.modules.base.entity.PartInformationEntity;
 import com.spring.modules.material.entity.Supplier;
 import com.spring.modules.sys.entity.SysUserEntity;
@@ -34,4 +35,16 @@ public interface NormalSearchMapper {
      * @throw
      */
     String getPartPropertiesValue(@Param("site") String site,@Param("partNo") String partNo,@Param("itemNo") String itemNo);
+
+    /**
+     * @Description 先进先出
+     * @Title newInNewOutWithSitePart
+      * @param site
+     * @param partNo
+     * @author rq
+     * @date 2024/7/15 17:59
+     * @return List<InventoryStockRoll>
+     * @throw
+     */
+    List<InventoryStockRoll> newInNewOutWithSitePart(@Param("site") String site,@Param("partNo") String partNo);
 }
diff --git a/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java b/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
index 5b7d864..80277a9 100644
--- a/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
+++ b/src/main/java/com/spring/modules/material/service/Impl/IssureSoServiceImpl.java
@@ -20,6 +20,7 @@ import com.spring.modules.production.entity.ShopOrder;
 import com.spring.modules.production.mapper.ShopOrderMapper;
 import com.spring.modules.production.vo.ShopOrderVo;
 import com.spring.modules.report.dao.ProcedureDao;
+import com.spring.modules.schedule.utils.DateUtils;
 import com.spring.modules.sys.entity.SysUserEntity;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -170,6 +171,17 @@ public class IssureSoServiceImpl implements IssureSoService {
         if(InventoryStockRollList.size()==0){
             throw new RuntimeException("卷号不存在或者不在库！");
         }
+        if("Y".equals(InventoryStockRollList.get(0).getFreezeFlag())){
+            throw new RuntimeException("该卷被冻结无法出库！");
+        }
+        //用物料和site去查询最早的生产日期来实现先进先出
+        List<InventoryStockRoll> newInNewOut= normalSearchMapper.newInNewOutWithSitePart(InventoryStockRollList.get(0).getSite(),InventoryStockRollList.get(0).getPartNo());
+        if(newInNewOut.size()==0){
+            throw new RuntimeException("物料库存不足！");
+        }
+        if(InventoryStockRollList.get(0).getManufactureDate().after(newInNewOut.get(0).getManufactureDate())){
+            throw new RuntimeException("请按照先进先出规则！最早生产日期为："+ DateUtils.getStringDate(newInNewOut.get(0).getManufactureDate()));
+        }
         ShopOrderVo shopOrder=new ShopOrderVo();
         shopOrder.setSite(inData.getSite());
         shopOrder.setOrderNo(inData.getOrderNo());
diff --git a/src/main/resources/mapper/base/NormalSearchMapper.xml b/src/main/resources/mapper/base/NormalSearchMapper.xml
index 82742cb..992fe08 100644
--- a/src/main/resources/mapper/base/NormalSearchMapper.xml
+++ b/src/main/resources/mapper/base/NormalSearchMapper.xml
@@ -84,4 +84,12 @@
 <select id="getPartPropertiesValue" resultType="String">
     select dbo.Get_PartPropertiesValue(#{site},#{partNo},#{itemNo})
 </select>
+
+
+<select id="newInNewOutWithSitePart" resultType="com.spring.modules.base.entity.InventoryStockRoll">
+    select top 1 a.site,a.RollNo,a.PartNo,a.ManufactureDate
+    from InventoryStock_Roll a left join TransDetailsub_cach b on a.Site=b.site and a.RollNo=b.RollNo
+    where a.site=#{site} and a.PartNo=#{partNo} and b.site is null and QtyOnHand>0
+    order by a.ManufactureDate
+</select>
 </mapper>
\ No newline at end of file