Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -521,4 +521,21 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "取消审核时间 ")
 	private Date cancleCheckTime;
 
+
+	@ApiModelProperty(value = "签收件数 ")
+	private Integer signNum;
+
+	@ApiModelProperty(value = "签收人")
+	private String signUserName;
+	@ApiModelProperty(value = "签收时间 ")
+	private Date signTime;
+
+	@ApiModelProperty(value = "文员复核人")
+	private String signCheckUserName;
+	@ApiModelProperty(value = "文员复核时间 ")
+	private Date signCheckTime;
+
+
+
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1290,6 +1290,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								Integer hQuantity = newStockArticleEntity.getHandQuantity() + unloadNum;
 								Integer incomingNum = newStockArticleEntity.getIncomingNum() + unloadNum;
 								Integer totalNumber = newStockArticleEntity.getTotalNumber();
+								String reservationStatus = newStockArticleEntity.getReservationStatus();
+								String orderStatus = newStockArticleEntity.getOrderStatus();
+
 
 								if (incomingNum.equals(totalNumber)) {
 									if (hQuantity.equals(totalNumber)) {
@@ -1301,6 +1304,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								} else {
 									newStockArticleEntity.setOrderReceiveStatus("20");
 								}
+
+								if(reservationStatus.equals("30")){
+									newStockArticleEntity.setReservationStatus("20");
+								}
+								if(orderStatus.equals("80")){
+									newStockArticleEntity.setOrderStatus("70");
+								}
+
 								newStockArticleEntity.setHandQuantity(hQuantity);
 								newStockArticleEntity.setIncomingNum(incomingNum);
 
@@ -1330,6 +1341,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 									DistributionParcelListEntity updatePaceList = new DistributionParcelListEntity();
 									updatePaceList.setId(parceListId);
 									updatePaceList.setQuantity(quantity+totalUnloadNum);
+									updatePaceList.setOrderPackageStatus("20");
+									updatePaceList.setOrderPackageStockupStatus("10");
+									updatePaceList.setOrderPackageReservationStatus("10");
+									updatePaceList.setOrderPackageLoadingStatus("10");
 									updateParceList.add(updatePaceList);
 
 									DistributionParcelNumberEntity parcelNumberEntity = mapByParcelListId.get(parceListId);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -106,6 +106,8 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 
 			WarehouseWaybillEntity updateEntity = new WarehouseWaybillEntity();
 			updateEntity.setId(waybillEntity.getId());
+			Integer signNum = waybillEntity.getSignNum();
+			if(signNum == 0){
 				if(totalCount == num){
 					if(packageStatus == 0){
 						updateEntity.setWaybillStatus("0");
@@ -117,8 +119,6 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 						updateEntity.setWaybillStatus("60");
 					}else if(packageStatus == 40){
 						updateEntity.setWaybillStatus("80");
-				}else if(packageStatus == 50){
-					updateEntity.setWaybillStatus("100");
 					}
 				}else{
 					if(packageStatus == 0){
@@ -131,7 +131,12 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 						updateEntity.setWaybillStatus("50");
 					}else if(packageStatus == 40){
 						updateEntity.setWaybillStatus("70");
-				}else if(packageStatus == 50){
+					}
+				}
+			}else{
+				if(signNum == totalCount){
+					updateEntity.setWaybillStatus("100");
+				}else{
 					updateEntity.setWaybillStatus("90");
 				}
 			}
@@ -139,7 +144,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 		}else if(waybillType == 2){
 			WarehouseWaybillEntity updateEntity = new WarehouseWaybillEntity();
 			updateEntity.setId(waybillEntity.getId());
-			Integer signNum = distributionStockArticleClient.findSignNumByWaybillNo(waybillNo,destinationWarehouseId);
+			Integer signNum = waybillEntity.getSignNum();
 			if(signNum != 0){
 				if(signNum == totalCount){
 					updateEntity.setWaybillStatus("100");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java

@@ -53,6 +53,10 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 
 		try {
 			String waybillNo = waybillLogDTO.getWaybillNo();
+			Integer num = waybillLogDTO.getNum();
+			String signUser = waybillLogDTO.getSignUser();
+			Date signTime = waybillLogDTO.getSignTime();
+			String nickName = waybillLogDTO.getNickName();
 
 			if(StringUtil.isNotBlank(waybillNo)){
 				WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
@@ -60,8 +64,21 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 					log.warn("未找到运单信息 waybillNo:{}",waybillNo);
 					return;
 				}
+
+				Integer signNum = warehouseWaybillEntity.getSignNum();
+				int newSignNum = signNum + num;
 				Integer waybillType = warehouseWaybillEntity.getWaybillType();
 				Long waybillId = warehouseWaybillEntity.getId();
+
+				WarehouseWaybillEntity updateWaybill = new WarehouseWaybillEntity();
+				updateWaybill.setId(waybillId);
+				updateWaybill.setSignNum(newSignNum);
+				updateWaybill.setSignUserName(signUser);
+				updateWaybill.setSignTime(signTime);
+				updateWaybill.setSignCheckUserName(nickName);
+				updateWaybill.setSignCheckTime(new Date());
+				warehouseWaybillClient.updateEntity(updateWaybill);
+
 				if(waybillType == 1){
 					//订制品运单
 					//加入零担运单签收日志
@@ -72,6 +89,10 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 					addZeroWaybillTrackLog(waybillLogDTO,warehouseWaybillEntity);
 
 				}
+
+
+
+
 			}
 		} catch (Exception e) {
 			log.error("添加签收日志失败",e);