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

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/DistributionStockupServiceImpl.java

@@ -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;