1.增加最新的入库时间 和 对 入库状态和 收货状态的维护 rep2

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

@@ -480,16 +480,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
+				distributionStockArticleEntity.setId(id);
 				if (id == 0) {
 					logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}", orderSelfNum);
 					throw new CustomerException(405, "保存订单信息失败");
 				}
 			}
-			id = distributionStockArticleEntity.getId();
-			//保存包件信息
-			saveOrderPackage(unitNo, distributionStockArticleEntity, id, basicdataWarehouseEntity, waybillNoNum);
-
 
+			//保存包件信息
+			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum);
 
 			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
 			if(!waybillNumber.contains(waybillNoNum)){
@@ -564,7 +563,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @param id
 	 * @param basicdataWarehouseEntity
 	 */
-	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, Long id, BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {
+	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
@@ -574,7 +573,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		entity.setConditions(1);
 		entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
 		entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
-		entity.setStockArticleId(id);
+		entity.setStockArticleId(distributionStockArticleEntity.getId());
 		entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
 		entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
 		entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());