Merge branch 'dev' into pre-production

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

@@ -518,6 +518,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}", orderSelfNum);
 					throw new CustomerException(405, "保存订单信息失败");
 				}
+			}else{
+				distributionStockArticleEntity.setTotalNumber(total);
+				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
+
 			}
 
 			//保存包件信息
@@ -532,27 +536,27 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 //				logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo);
 //			}
 
-			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
-			if(!waybillNumber.contains(waybillNoNum)){
-				waybillNumber = waybillNumber+","+waybillNoNum;
-			}
-			distributionStockArticleEntity.setWaybillNumber(waybillNumber);
-
-			// 修改入库状态
-			distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1);
-			String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity);
-			distributionStockArticleEntity.setOrderStatus(orderStatus);
-
-			// 修改收货
-			if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){
-				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
-				// 更新齐套状态
-				// todo 这里需要多仓齐套的查询条件
-				distributionStockArticleEntity.setCompleteSet(1);
-			}
-			// 修改最新的入库时间
-			distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date());
-			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
+//			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
+//			if(!waybillNumber.contains(waybillNoNum)){
+//				waybillNumber = waybillNumber+","+waybillNoNum;
+//			}
+//			distributionStockArticleEntity.setWaybillNumber(waybillNumber);
+//
+//			// 修改入库状态
+//			distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1);
+//			String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity);
+//			distributionStockArticleEntity.setOrderStatus(orderStatus);
+//
+//			// 修改收货
+//			if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){
+//				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
+//				// 更新齐套状态
+//				// todo 这里需要多仓齐套的查询条件
+//				distributionStockArticleEntity.setCompleteSet(1);
+//			}
+//			// 修改最新的入库时间
+//			distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date());
+//			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 
 //			包件保存成功去修改订单的数量
 //			distributionStockArticleClient.addHandQuantity(id, 1);
@@ -732,6 +736,22 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			if (!b) {
 				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderCode={}", entity.getOrderCode());
 				throw new CustomerException(405, "保存包件信息失败");
+			}else{
+				logger.info("################handleDataToPlatform: 保存包件成功 OrderPackageCode={}",vo.getPacketBarCode());
+				Integer handQuantity = distributionStockArticleEntity.getHandQuantity();
+				Integer totalNumber = distributionStockArticleEntity.getTotalNumber();
+
+				if(handQuantity+1 >= totalNumber){
+					distributionStockArticleEntity.setCompleteSet(1);
+					distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
+					distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
+				}else{
+					distributionStockArticleEntity.setCompleteSet(0);
+					distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
+					distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
+				}
+				distributionStockArticleEntity.setHandQuantity(handQuantity + 1);
+				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 			}
 		}
 	}

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1334,6 +1334,8 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			}
 		}else{
 			id = distributionStockArticleEntity.getId();
+			distributionStockArticleEntity.setTotalNumber(total);
+			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 		}
 
 		//保存包件信息
@@ -1373,6 +1375,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo, entity);
+			entity.setQuantity(1);
 			entity.setOrderPackageCode(vo.getPacketBarCode());
 			entity.setConditions(1);
 			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
@@ -1386,9 +1389,9 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 //			if(3==carsType||4 == carsType){
 //				entity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());
 //			}
-			if(2 == signState){
-				entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-			}
+//			if(2 == signState){
+//				entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
+//			}
 			entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
 			entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 			entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());
@@ -1445,6 +1448,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 					distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 					distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
 				}
+				distributionStockArticleEntity.setHandQuantity(handQuantity + 1);
 				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 			}
 

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

@@ -35,7 +35,7 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 		trayGoodsLogEntity.setBindingType(bindingType);
 		trayGoodsLogEntity.setRemark(remark);
 		trayGoodsLogEntity.setPalletizingType(palletizingType);
-		trayGoodsLogEntity.setNum(parcelListEntity.getQuantity());
+		trayGoodsLogEntity.setNum(1);
 		trayGoodsLogEntity.setWarehouseId(trayTypeEntity.getWarehouseId());
 		trayGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		save(trayGoodsLogEntity);

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

@@ -57,7 +57,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		trayGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		trayGoodsEntity.setAssociationType("3");
 		trayGoodsEntity.setGoodsName(parcelListEntity.getMaterialName());
-		trayGoodsEntity.setNum(parcelListEntity.getQuantity());
+		trayGoodsEntity.setNum(1);
 		trayGoodsEntity.setIsFleeing(isException);
 		trayGoodsEntity.setWarehouseId(trayTypeEntity.getWarehouseId());
 		save(trayGoodsEntity);

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

@@ -16,7 +16,6 @@
  */
 package com.logpm.warehouse.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -27,7 +26,6 @@ import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity;
 import com.logpm.warehouse.excel.WarehouseCustomizedExcel;
 import com.logpm.warehouse.excel.WarehouseStockedExcel;
 import com.logpm.warehouse.excel.WarehouseTemporaryExcel;
-import com.logpm.warehouse.excel.WarehouseUpdownGoodsLogExcel;
 import com.logpm.warehouse.mapper.WarehouseUpdownGoodsLogMapper;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
@@ -94,7 +92,7 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 		warehouseUpdownGoodsLogEntity.setAssociationId(parcelListEntity.getId());
 		warehouseUpdownGoodsLogEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		warehouseUpdownGoodsLogEntity.setAssociationType("3");
-		warehouseUpdownGoodsLogEntity.setNum(parcelListEntity.getQuantity());
+		warehouseUpdownGoodsLogEntity.setNum(1);
 		warehouseUpdownGoodsLogEntity.setRemark(remark);
 		warehouseUpdownGoodsLogEntity.setWarehouseId(updownTypeEntity.getWarehouseId());
 		save(warehouseUpdownGoodsLogEntity);

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

@@ -114,7 +114,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		updownGoodsEntity.setAssociationId(parcelListEntity.getId());
 		updownGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		updownGoodsEntity.setAssociationType("3");//包件
-		updownGoodsEntity.setNum(parcelListEntity.getQuantity());
+		updownGoodsEntity.setNum(1);
 		updownGoodsEntity.setWarehouseId(updownTypeEntity.getWarehouseId());
 		save(updownGoodsEntity);
 		//存入包件货物上架记录