From 523507c7f239fa6ccc64f099c015ab0b30a33ec3 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Mon, 21 Mar 2022 11:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=80=9A=E7=9F=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5SKU?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzjee/wm/entity/WmOmNoticeIEntity.java    | 15 +++++++++++
 .../service/impl/WmOmNoticeHServiceImpl.java  |  2 ++
 .../webpage/com/zzjee/wm/wmOmNoticeIList.jsp  | 26 +++++++++----------
 .../com/zzjee/wm/wmOmNoticeitemList.jsp       |  7 ++---
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
index e80d2401..4c84faae 100644
--- a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
+++ b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
@@ -13,6 +13,8 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
+
+import com.zzjee.md.entity.MdGoodsEntity;
 import org.hibernate.annotations.GenericGenerator;
 import javax.persistence.SequenceGenerator;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -125,6 +127,9 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
 	private java.lang.String chpShuXing;
 	@Excel(name="商品条码")
 	private java.lang.String barCode;
+
+	@Excel(name="sku")
+	private String sku;
 	/**
 	 *方法: 取得java.lang.String
 	 *@return: java.lang.String  主键
@@ -696,4 +701,14 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
 	public void setBarCode(java.lang.String barCode){
 		this.barCode = barCode;
 	}
+
+
+	@Column(name ="sku",nullable=true,length=32)
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
 }
diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
index 372cfea3..509a4666 100644
--- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
+++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
@@ -57,6 +57,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
 					if(mvgoods!=null){
 						huowu=huowu+mvgoods.getGoodsName();
 						wmOmNoticeI.setGoodsName(mvgoods.getGoodsName());
+						wmOmNoticeI.setSku(mvgoods.getSku());//SKU
 						wmOmNoticeI.setChpShuXing(mvgoods.getChpShuXing());//产品属性
 						wmOmNoticeI.setBarCode(mvgoods.getShpTiaoMa());//商品条码
 						try{
@@ -150,6 +151,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
 				if(mvgoods!=null){
 					huowu=huowu+";"+mvgoods.getGoodsName()+","+wmOmNoticeI.getBaseGoodscount();
 					wmOmNoticeI.setGoodsName(mvgoods.getGoodsName());
+
 					try{
 						wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit());
 						wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei());
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
index a16e2ec7..92099a9c 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeIList.jsp
@@ -96,9 +96,9 @@
 					  <th>
 							下架任务是否已生成
 					  </th>
-			  <%--<th>--%>
-				  <%--出货储位--%>
-			  <%--</th>--%>
+			  <th>
+				  SKU
+			  </th>
 					  <%--<th>--%>
 						  <%--出货托盘--%>
 					  <%--</th>--%>
@@ -130,11 +130,11 @@
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
 
-				<%--<td>--%>
-					<%--<input name="wmOmNoticeIList[0].binOm" maxlength="32"--%>
-						   <%--type="text" class="form-control"  style="width:120px;" >--%>
-					<%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
-				<%--</td>--%>
+				<td>
+					<input name="wmOmNoticeIList[0].sku" maxlength="32"
+						   type="text" class="form-control"  style="width:120px;" >
+					<label class="Validform_label" style="display: none;">SKU</label>
+				</td>
 
 				<%--<td>--%>
 					<%--<input name="wmOmNoticeIList[0].binId" maxlength="32"--%>
@@ -205,11 +205,11 @@ wmOmNoticeIList[${stuts.index }].goodsId<input name="wmOmNoticeIList[${stuts.ind
 										typeGroupCode="sf_yn" defaultVal="${poVal.planSta}" hasLabel="false"  title="下架任务是否已生成"></t:dictSelect>
 					  <label class="Validform_label" style="display: none;">下架任务是否已生成</label>
 					</td>
-				<%--<td align="left">--%>
-					<%--<input name="wmOmNoticeIList[${stuts.index }].binOm" maxlength="32"--%>
-						   <%--type="text" class="form-control"  style="width:120px;"  value="${poVal.binOm }">--%>
-					<%--<label class="Validform_label" style="display: none;">出货储位</label>--%>
-				<%--</td>--%>
+				<td align="left">
+					<input name="wmOmNoticeIList[${stuts.index }].sku" maxlength="32"
+						   type="text" class="form-control"  style="width:120px;"  value="${poVal.sku }">
+					<label class="Validform_label" style="display: none;">SKU</label>
+				</td>
 				<%--<td align="left">--%>
 					<%--<input name="wmOmNoticeIList[${stuts.index }].binId" maxlength="32"--%>
 						   <%--type="text" class="form-control"  style="width:120px;"  value="${poVal.binId }">--%>
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
index 3e5039c5..5cb707a5 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
@@ -20,6 +20,7 @@
       <t:dgCol title="客户订单号"  field="imCusCode"  query="true"       queryMode="single"  width="120"></t:dgCol>
       <t:dgCol title="备注"  field="omBeizhu"   query="true"       queryMode="single"  width="120"></t:dgCol>
       <t:dgCol title="商品名称"  field="goodsName"   query="true"       queryMode="single"  width="120"></t:dgCol>
+      <t:dgCol title="SKU"  field="sku"   query="true"       queryMode="single"  width="120"></t:dgCol>
       <t:dgCol title="出货数量"  field="goodsQua"   extendParams="editor:'text'"  queryMode="single"  width="80"></t:dgCol>
       <t:dgCol title="出货单位"  field="goodsUnit"    queryMode="single"  width="80"></t:dgCol>
       <t:dgCol title="生产日期"  field="goodsProData"  formatter="yyyy-MM-dd"  extendParams="editor:'text'"   queryMode="single"  width="120"></t:dgCol>
@@ -29,7 +30,7 @@
 
       <t:dgCol title="下架计划生成状态"  field="planSta"     extendParams="editor:'text'" queryMode="single"  width="80"></t:dgCol>
 
-  
+
 <%--     <t:dgToolBar operationCode="add" title="录入" icon="icon-add"  funname="addRow"></t:dgToolBar> --%>
 	<t:dgToolBar operationCode="edit" title="选择修改" icon="icon-edit"  funname="editRow"></t:dgToolBar>
 	<t:dgToolBar operationCode="save" title="修改保存" icon="icon-save" url="wmOmNoticeHController.do?saveOmnotice" funname="saveData"></t:dgToolBar>
@@ -108,5 +109,5 @@
 
 
 	}
- 
- </script>
\ No newline at end of file
+
+ </script>