Browse Source

发货提醒记录增加结案状态和发货状态

hejq 7 years ago
parent
commit
e881ae7be0

+ 20 - 2
src/main/java/com/uas/platform/b2b/erp/model/NoticeRecordDetail.java

@@ -59,10 +59,20 @@ public class NoticeRecordDetail implements Serializable {
     private Long b2bId = -1L;
 
     /**
-     * 结案状态
+     * 发货状态
      */
     @Column(name = "nod_status")
-    private Short status = 0;
+    private Short status = 200;
+
+    /**
+     * 结案状态
+     * <per>
+     *     1. 结案
+     *     0. 未结案
+     * </per>
+     */
+    @Column(name = "nod_end")
+    private Short end = 0;
 
     /**
      * 需求数量
@@ -147,6 +157,14 @@ public class NoticeRecordDetail implements Serializable {
         this.status = status;
     }
 
+    public Short getEnd() {
+        return end;
+    }
+
+    public void setEnd(Short end) {
+        this.end = end;
+    }
+
     public Double getNeedQty() {
         return needQty;
     }

+ 2 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/NoticeRecordServiceImpl.java

@@ -80,7 +80,8 @@ public class NoticeRecordServiceImpl implements NoticeRecordService {
             detail.setB2bId(notice.getId());
             detail.setNeedQty(notice.getQty());
             detail.setSendQty(notice.getEndQty());
-            detail.setStatus(notice.getEnd());
+            detail.setEnd(notice.getEnd());
+            detail.setStatus(notice.getStatus());
             detail.setNoDate(notice.getDate());
             if (detail.getSendQty() == 0) {
                 detail.setOkStatus(Constant.YES);