修改零担的包件类型状态值 默认为3

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -351,7 +351,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	}
 
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void handleDataToPlatform(String unitNo, String operationTime) {
 		log.info("############handleDataToPlatform: 处理数据到platform  unitNo={}", unitNo);
@@ -490,6 +490,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					}
 				}
 
+
+
+
+
 				String customerName = wayBillEntity.getTakeCompany();//客户名称
 
 				//通过客户名称去查询客户的服务类型、

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -276,7 +276,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 					entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
 					entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
 					entity.setQuantity(warehouseWayBillDetail.getNum());
-					entity.setConditions(1);
+					// 零担的包件 默认类型为3
+					entity.setConditions(3);
 					entity.setStockArticleId(id);
 					entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
 					entity.setOrderPackageStatus("20");