From 30d46f8a8d27d3b6edffd6e2ea082a62981c16cb Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Wed, 23 Mar 2022 18:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/controller/WmOmNoticeHController.java | 6 ++-- .../com/zzjee/wm/page/WmNoticeImpPage.java | 28 +++++++-------- .../com/zzjee/wm/page/WmOmNoticeImpPage.java | 30 ++++++++-------- .../zzjee/wm/page/WmOmNoticeImpnewPage.java | 34 +++++++++---------- 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java index c5d5875b..49b41fc0 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -3190,7 +3190,7 @@ public class WmOmNoticeHController extends BaseController { String noticeid = wmUtil.getNextomNoticeId(wmOmNoticeH.getOrderTypeCode()); wmOmNoticeH.setOmNoticeId(noticeid); wmOmNoticeH.setOmBeizhu(pageheader.getImBeizhu()); - wmOmNoticeH.setOcusCode(pageheader.getSupCode()); + wmOmNoticeH.setOcusCode(pageheader.getOcusCode()); wmOmNoticeH.setDelvAddr(pageheader.getDelvAddr()); MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class, "keHuBianMa", wmOmNoticeH.getOcusCode()); if (mdcusother != null) { @@ -3253,6 +3253,8 @@ public class WmOmNoticeHController extends BaseController { wmNoticeImpPage.setGoodsName(t.getGoodsName());//商品名称 wmNoticeImpPage.setGoodsQua(t.getGoodsQua());//数量 wmNoticeImpPage.setGoodsUnit(t.getGoodsUnit());//单位 + wmNoticeImpPage.setOcusCode(t.getOcusCode());//三方客户编码 + wmNoticeImpPage.setOcusName(t.getOcusName());//三方客户名字 list.add(wmNoticeImpPage); listheader.add(wmNoticeImpPage); } @@ -3326,7 +3328,7 @@ public class WmOmNoticeHController extends BaseController { String noticeid = wmUtil.getNextomNoticeId(wmOmNoticeH.getOrderTypeCode()); wmOmNoticeH.setOmNoticeId(noticeid); wmOmNoticeH.setOmBeizhu(pageheader.getImBeizhu()); - wmOmNoticeH.setOcusCode(pageheader.getSupCode()); + wmOmNoticeH.setOcusCode(pageheader.getOcusCode()); wmOmNoticeH.setDelvAddr(pageheader.getDelvAddr()); MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class, "keHuBianMa", wmOmNoticeH.getOcusCode()); if (mdcusother != null) { diff --git a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java index 766b0684..8e55045b 100644 --- a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java +++ b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java @@ -68,11 +68,11 @@ public class WmNoticeImpPage implements java.io.Serializable { /**进货通知单号*/ // @Excel(name="通知单号") private String noticeId; - @Excel(name="供应商编码") - private String supCode; - /**附件*/ - @Excel(name="供应商名称") - private String supName; + @Excel(name="客户编号") + private java.lang.String ocusCode; + @Excel(name="客户名称") + private java.lang.String ocusName; + @Excel(name="行项目标识ID") private java.lang.String otherId; @Excel(name="商品") @@ -353,23 +353,23 @@ public class WmNoticeImpPage implements java.io.Serializable { this.wherecon = wherecon; } - public String getSupCode() { - return supCode; + + public String getOcusCode() { + return ocusCode; } - public void setSupCode(String supCode) { - this.supCode = supCode; + public void setOcusCode(String ocusCode) { + this.ocusCode = ocusCode; } - public String getSupName() { - return supName; + public String getOcusName() { + return ocusName; } - public void setSupName(String supName) { - this.supName = supName; + public void setOcusName(String ocusName) { + this.ocusName = ocusName; } - public String getOtherId() { return otherId; } diff --git a/src/main/java/com/zzjee/wm/page/WmOmNoticeImpPage.java b/src/main/java/com/zzjee/wm/page/WmOmNoticeImpPage.java index 4d13db61..2e9f5023 100644 --- a/src/main/java/com/zzjee/wm/page/WmOmNoticeImpPage.java +++ b/src/main/java/com/zzjee/wm/page/WmOmNoticeImpPage.java @@ -5,12 +5,12 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -/** +/** * @Title: Entity * @Description: 导入 * @author erzhongxmu * @date 2017-09-11 15:08:34 - * @version V1.0 + * @version V1.0 * */ public class WmOmNoticeImpPage implements java.io.Serializable { @@ -45,7 +45,7 @@ public class WmOmNoticeImpPage implements java.io.Serializable { private String sysCompanyCode; /**客户编码*/ - @Excel(name="客户编码") + @Excel(name="货主编码") private String cusCode; /**预计到货时间*/ @@ -64,10 +64,11 @@ public class WmOmNoticeImpPage implements java.io.Serializable { private String noticeId; - private String supCode; - /**附件*/ + @Excel(name="客户编号") + private java.lang.String ocusCode; + @Excel(name="客户名称") + private java.lang.String ocusName; - private String supName; private String otherId; @Excel(name="商品编号") @@ -346,23 +347,22 @@ public class WmOmNoticeImpPage implements java.io.Serializable { this.wherecon = wherecon; } - public String getSupCode() { - return supCode; + public String getOcusCode() { + return ocusCode; } - public void setSupCode(String supCode) { - this.supCode = supCode; + public void setOcusCode(String ocusCode) { + this.ocusCode = ocusCode; } - public String getSupName() { - return supName; + public String getOcusName() { + return ocusName; } - public void setSupName(String supName) { - this.supName = supName; + public void setOcusName(String ocusName) { + this.ocusName = ocusName; } - public String getOtherId() { return otherId; } diff --git a/src/main/java/com/zzjee/wm/page/WmOmNoticeImpnewPage.java b/src/main/java/com/zzjee/wm/page/WmOmNoticeImpnewPage.java index 6718b69a..411c6c8e 100644 --- a/src/main/java/com/zzjee/wm/page/WmOmNoticeImpnewPage.java +++ b/src/main/java/com/zzjee/wm/page/WmOmNoticeImpnewPage.java @@ -5,12 +5,12 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; -/** +/** * @Title: Entity * @Description: 导入 * @author erzhongxmu * @date 2017-09-11 15:08:34 - * @version V1.0 + * @version V1.0 * */ public class WmOmNoticeImpnewPage implements java.io.Serializable { @@ -45,7 +45,7 @@ public class WmOmNoticeImpnewPage implements java.io.Serializable { private String sysCompanyCode; /**客户编码*/ - @Excel(name="客户编码") + @Excel(name="货主编码") private String cusCode; /**预计到货时间*/ @Excel(name="预计出货时间",format = "yyyy-MM-dd") @@ -84,11 +84,12 @@ public class WmOmNoticeImpnewPage implements java.io.Serializable { /**进货通知单号*/ // @Excel(name="通知单号") private String noticeId; -// @Excel(name="合作伙伴编号") - private String supCode; - /**附件*/ -// @Excel(name="合作伙伴名称") - private String supName; + @Excel(name="客户编号") + + private java.lang.String ocusCode; + @Excel(name="客户名称") + private java.lang.String ocusName; + // @Excel(name="其他系统ID") private String otherId; @Excel(name="商品") @@ -369,23 +370,22 @@ public class WmOmNoticeImpnewPage implements java.io.Serializable { this.wherecon = wherecon; } - public String getSupCode() { - return supCode; + public String getOcusCode() { + return ocusCode; } - public void setSupCode(String supCode) { - this.supCode = supCode; + public void setOcusCode(String ocusCode) { + this.ocusCode = ocusCode; } - public String getSupName() { - return supName; + public String getOcusName() { + return ocusName; } - public void setSupName(String supName) { - this.supName = supName; + public void setOcusName(String ocusName) { + this.ocusName = ocusName; } - public String getOtherId() { return otherId; }