weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-13 10:29:59 +08:00
parent 4bd8005e1e ab9a8ced81
commit b90b27fd2c
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+8
View File
@@ -1001,6 +1001,14 @@ public class StockShelfOrderApplicationService {
labelToFieldNameMap.put("总体积", "totalVolume");
labelToFieldNameMap.put("总面积", "totalArea");
labelToFieldNameMap.put("总价", "totalPrice");
labelToFieldNameMap.put("扩展属性1", "extAttr1");
labelToFieldNameMap.put("扩展字段1", "extAttr1");
labelToFieldNameMap.put("扩展属性2", "extAttr2");
labelToFieldNameMap.put("扩展字段2", "extAttr2");
labelToFieldNameMap.put("扩展属性3", "extAttr3");
labelToFieldNameMap.put("扩展字段3", "extAttr3");
labelToFieldNameMap.put("扩展属性4", "extAttr4");
labelToFieldNameMap.put("扩展字段4", "extAttr4");
// 精确匹配
String fieldName = labelToFieldNameMap.get(batchLabel.trim());
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
+12
View File
@@ -154,6 +154,18 @@ public class ShelfMaterialDetailImpl extends ServiceImpl<ShelfMaterialDetailMapp
String refVal = null;
if ("InvoiceNo".equalsIgnoreCase(attributeOption) || "Invoice No".equalsIgnoreCase(batchLabels) || "发票号".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getExtAttr1();
} else if ("扩展字段1".equals(batchLabels) || "扩展属性1".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getExtAttr1();
} else if ("扩展字段2".equals(batchLabels) || "扩展属性2".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getExtAttr2();
} else if ("扩展字段3".equals(batchLabels) || "扩展属性3".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getExtAttr3() != null
? new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(shelfMaterialDetailPO.getExtAttr3())
: null;
} else if ("扩展字段4".equals(batchLabels) || "扩展属性4".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getExtAttr4() != null
? new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(shelfMaterialDetailPO.getExtAttr4())
: null;
} else if ("BatchRefNo".equalsIgnoreCase(attributeOption) || "Batch Ref NO's".equalsIgnoreCase(batchLabels) || "批次参考号".equals(batchLabels)) {
refVal = shelfMaterialDetailPO.getBatchRefNo();
} else if ("SheetRefNo".equalsIgnoreCase(attributeOption) || "Sheet Ref NO's".equalsIgnoreCase(batchLabels) || "单据参考号".equals(batchLabels)) {
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
+1 -1
View File
@@ -374,7 +374,7 @@ public class StockOutOrderPO extends BaseVOEntity {
@Excel(name = "是否需要运输")
private String needTransportFlag;
@ApiModelProperty("app上传的图片")
@ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
private String pictureApp;
@ApiModelProperty("出库总数量")
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
+3
View File
@@ -394,4 +394,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
@ApiModelProperty(name = "审核时间查询条件结束日期")
private String auditTimeEnd;
@ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
private String pictureApp;
}