1更新

src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java

@@ -182,7 +182,11 @@ public class OutBoundServiceImpl implements OutBoundService {
 		}
 		//判断各种情况
 		String receiveFlag = notifySerial.getReceiveFlag();
-		String deliveryFlag = notifySerial.getDeliveryFlag();
+		List<String> shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo);
+		if(shopOrderSerials.isEmpty()){
+			throw new RuntimeException("该序列号追踪不到生产订单序列号明细!");
+		}
+		String deliveryFlag = shopOrderSerials.get(0);
 		//String currentDelNotifyNo = notifySerial.getDelNotifyNo();
 		if(!"Y".equalsIgnoreCase(receiveFlag)){
 			throw new RuntimeException("当前序列号未入库。");

src/main/java/com/letian/modules/production/dao/PalletMapper.java

@@ -319,6 +319,8 @@ public interface PalletMapper {
      * @throw
      */
     List<PalletFillDetailData>  getSaveData(PalletFillDetailData inData);
+
+    List<String>  getShopOrderSerialNoDeliveyFlag(@Param("site") String site,@Param("serialNo") String serialNo);
     /**
      * @Description
      * @Title

src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java

@@ -623,6 +623,7 @@ public class PalletServiceImpl implements PalletService {
             String serialNo = list.get(i).getSerialNo();
             String userId = inData.getUserId();
             List<NotifySerialOutData> notifySerials = outBoundDao.getNotifyserialNoByCon(site, serialNo, delNotifyNo);
+            List<String> shopOrderSerials = palletMapper.getShopOrderSerialNoDeliveyFlag(site, serialNo);
             if(notifySerials.size() == 0){
                 throw new RuntimeException("栈板中序列号："+serialNo+",不在通知单号："+delNotifyNo+"下。请核实!");
             }
@@ -645,7 +646,10 @@ public class PalletServiceImpl implements PalletService {
             }
             //判断各种情况
             String receiveFlag = notifySerial.getReceiveFlag();
-            String deliveryFlag = notifySerial.getDeliveryFlag();
+            if(shopOrderSerials.isEmpty()){
+                throw new RuntimeException("该序列号追踪不到生产订单序列号明细!");
+            }
+            String deliveryFlag = shopOrderSerials.get(0);
             // String currentDelNotifyNo = notifySerial.getDelNotifyNo();
             //**************2022-05-19 由于历史遗留数据 暂时关闭 后面可以开启*************************start
             // if(!"Y".equalsIgnoreCase(receiveFlag)){

src/main/resources/mapper/production/PalletMapper.xml

@@ -227,6 +227,9 @@
      <select id="getSaveData" resultType="com.letian.modules.production.entity.PalletFillDetailData">
         SELECT  partNo from ShopOrderSerialNoList where SerialNo=#{serialNo}
     </select>
+    <select id="getShopOrderSerialNoDeliveyFlag" resultType="String">
+        SELECT  DeliveryFlag from ShopOrderSerialNoList where site=#{site} and SerialNo=#{serialNo}
+    </select>
 
     <insert id="savePalletFillDetail">
         insert into Pallet_FillDetail (pallet_no,PartNo,SerialNo,SubNo,BatchNo,Qty,CreateDate,CreateBy,Site)