Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java

@@ -21,7 +21,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -37,6 +39,8 @@ import java.util.Date;
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
+@NoArgsConstructor
+@AllArgsConstructor
 public class DistributionMarketExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -71,7 +75,7 @@ public class DistributionMarketExcel implements Serializable {
 
 	@ColumnWidth(20)
 	@ExcelProperty("备货人员")
-	private Long forklift;
+	private String forkliftName;
 
 	@ColumnWidth(20)
 	@ExcelProperty("所在托盘")

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -555,8 +555,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 				loadscanEntity.setIsAbnormalLoading(1);
 				//出库
-//				warehouseUpdownTypeClient.downPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
-				warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
+				warehouseUpdownTypeClient.downPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
+//				warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
 				//订单扣减在库数量
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
 				stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - parcelListEntity.getQuantity());
@@ -646,7 +646,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							if (reservationFlag) {
 								List<DistributionLoadscanEntity> reservationLoadscanEntities = new ArrayList<>();
 								for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
-									warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
+									try {
+										warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
+									}catch (Exception e){
+										log.error("#################货物下架错误：{}",parcelListEntity.getOrderPackageCode());
+										return Resp.scanFail("装车失败", "装车失败");
+									}
 									if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) {
 										parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 										parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1881,7 +1881,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getDriverSigning, 2)
 			.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date()));
 
-
 		boolean update = this.update(set);
 		return R.status(true);
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -1823,7 +1823,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			String  trayCode= stockupDTO.getTrayBarCode() ;
 			//货位下架
 			R r = warehouseUpdownTypeClient.downTray(trayCode,warehouseId );
-			if(r.getCode() != 200){
+			if(ObjectUtils.isNull(r) || ObjectUtils.isNotNull(r) && r.getCode() != 200){
 				throw new ServiceException("下架失败！！");
 			}
 			//TODO 其他操作
@@ -2555,7 +2555,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		List<DistributionMarketExcel> list = baseMapper.exportMarket(paramMap, idArr);
 		list.forEach(li -> {
-			li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus()));
+			switch (li.getStockupStatus()) {
+				case "10":
+					li.setStockupStatus("待分配");
+					break;
+				case "20":
+					li.setStockupStatus("待备货");
+					break;
+				case "30":
+					li.setStockupStatus("备货中");
+					break;
+				case "40":
+					li.setStockupStatus("已备货");
+					break;
+			}
 			li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派");
 		});
 		return list;
@@ -2581,7 +2594,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		paramMap.put("tenantId", tenantId);
 		List<DistributionCityExcel> list = baseMapper.exportCity(paramMap, idArr);
 		list.forEach(li -> {
-			li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus()));
+			switch (li.getStockupStatus()) {
+				case "10":
+					li.setStockupStatus("待分配");
+					break;
+				case "20":
+					li.setStockupStatus("待备货");
+					break;
+				case "30":
+					li.setStockupStatus("备货中");
+					break;
+				case "40":
+					li.setStockupStatus("已备货");
+					break;
+			}
 			li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派");
 		});
 		return list;
@@ -2608,7 +2634,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		List<DistributionSelfExcel> list = baseMapper.exportSelf(paramMap, idArr);
 		list.forEach(li -> {
-			li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus()));
+			switch (li.getStockupStatus()) {
+				case "10":
+					li.setStockupStatus("待分配");
+					break;
+				case "20":
+					li.setStockupStatus("待备货");
+					break;
+				case "30":
+					li.setStockupStatus("备货中");
+					break;
+				case "40":
+					li.setStockupStatus("已备货");
+					break;
+			}
 			li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派");
 		});
 		return list;