PC出库单详情展示图片
This commit is contained in:
+8
@@ -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());
|
||||
|
||||
+12
@@ -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)) {
|
||||
|
||||
+1
-1
@@ -374,7 +374,7 @@ public class StockOutOrderPO extends BaseVOEntity {
|
||||
@Excel(name = "是否需要运输")
|
||||
private String needTransportFlag;
|
||||
|
||||
@ApiModelProperty("app上传的图片")
|
||||
@ApiModelProperty("出库交接图片,PDA出库交接时上传的照片,多张图片以逗号隔开")
|
||||
private String pictureApp;
|
||||
|
||||
@ApiModelProperty("出库总数量")
|
||||
|
||||
@@ -394,4 +394,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
|
||||
|
||||
@ApiModelProperty(name = "审核时间查询条件结束日期")
|
||||
private String auditTimeEnd;
|
||||
|
||||
@ApiModelProperty("出库交接图片,PDA出库交接时上传的照片,多张图片以逗号隔开")
|
||||
private String pictureApp;
|
||||
}
|
||||
Reference in New Issue
Block a user