diff --git a/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java b/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java index 9f61212..e458542 100644 --- a/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java +++ b/src/main/java/com/nov/KgLowDurable/constant/TwoOutApproverConstant.java @@ -23,7 +23,7 @@ public class TwoOutApproverConstant { public static final String TEXT_ORDER_NO = "Text-1768182878024"; /** - * 单号 - 出库组别 + * 出库名称 - 出库组别 */ public static final String OUT_GROUP = "Text-1768268948529"; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java index 0e7277a..6ac0afa 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java @@ -97,4 +97,9 @@ public class LdTwoOutStorage implements Serializable { * 出库状态:0-未出库;1-已出库;2-已驳回 */ private String status; + + /** + * 分组名称 + */ + private String groupName; } \ No newline at end of file diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java index 42279b9..a31c302 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java @@ -343,7 +343,7 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl contents = Arrays.asList( new Content(OnePutApproverConstant.TEXT, OnePutApproverConstant.TEXT_INBOUND_PERSON, Value.textValue(dto.getUserInfoVO().getName())), new Content(OnePutApproverConstant.TEXT, OnePutApproverConstant.TEXT_PURCHASE_ORDER_NAME, Value.textValue(dto.getPurchaseEndInfo())), diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java index c19d884..ef29838 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -156,11 +156,12 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl contents = Arrays.asList( new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_RECEIVER, Value.textValue(dto.getLdTwoOutStorage().getProposerName())), new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_DEPARTMENT, Value.textValue(dto.getLdTwoOutStorage().getDepartment())), new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_ORDER_NO, Value.textValue(dto.getLdTwoOutStorage().getOrderNo())), + new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.OUT_GROUP, Value.textValue(dto.getLdTwoOutStorage().getGroupName().equals("自由出库") ? null : dto.getLdTwoOutStorage().getGroupName())), new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXTAREA_REASON, Value.textValue(dto.getLdTwoOutStorage().getReason())), new Content(TwoOutApproverConstant.TABLE, TwoOutApproverConstant.TABLE_MATERIAL_LIST, Value.tableValue(tableRowList)) diff --git a/src/main/resources/mapper/LdTwoOutStorageMapper.xml b/src/main/resources/mapper/LdTwoOutStorageMapper.xml index 97ac564..9056b4f 100644 --- a/src/main/resources/mapper/LdTwoOutStorageMapper.xml +++ b/src/main/resources/mapper/LdTwoOutStorageMapper.xml @@ -17,6 +17,7 @@ +