1更新

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

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

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

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