diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java index 150b272f..11d97479 100644 --- a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java +++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java @@ -376,6 +376,14 @@ public class TmsYwDingdanController extends BaseController { String omnoticeid = tmsYwDingdan.getFadh(); List listtemp = systemService.findByProperty(WmTmsNoticeIEntity.class,"omNoticeId",omnoticeid); for(WmTmsNoticeIEntity t: listtemp){ +// 收货人 +// 收货人电话 +// 车号 +// 收货人地址 + t.setBaseUnit(tmsYwDingdan.getShouhuoren()); + t.setBaseGoodscount(tmsYwDingdan.getShrsj()); + t.setPlanSta(tmsYwDingdan.getChehao()); + t.setBinId(tmsYwDingdan.getShrdh()); arrayoutlist.add(t); } }catch (Exception e){ diff --git a/src/main/webapp/webpage/com/zzjee/tms/chukumingxi.jsp b/src/main/webapp/webpage/com/zzjee/tms/chukumingxi.jsp index e5755f05..f437e5ee 100644 --- a/src/main/webapp/webpage/com/zzjee/tms/chukumingxi.jsp +++ b/src/main/webapp/webpage/com/zzjee/tms/chukumingxi.jsp @@ -140,65 +140,67 @@ function downloadqrcode() { 打印
- - +<%-- --%> +<%-- --%> - + <%----%> - + - - + - + - - - - - - + + + + + + + <%----%> - +<%-- --%> - - - - - - + + + + + +<%-- --%> +<%-- --%> - - + + - + <%----%> + +<%-- --%> + + - - - - - - - - + + +<%-- --%> +<%-- --%> +<%-- --%> @@ -212,7 +214,6 @@ function downloadqrcode() { style='mso-spacerun:yes'>                        叉车： -
出库明细
单号商品编码商品 单位生产日期生产日期数量重量体积规格拣货托盘/保质期二维码收货人收货人电话车号收货人地址托盘/保质期二维码
${poVal.binId }　${poVal.omNoticeId }　${poVal.goodsId }${poVal.goodsName }${poVal.goodsUnit }${poVal.goodsProData }${poVal.goodsQua }${poVal.baseUnit }${poVal.proData } ${poVal.baseGoodscount }${poVal.tinZhl }${poVal.tinTj }${poVal.shpGuiGe }${poVal.pickNotice }${poVal.tinId }/${poVal.baoZhiq }${poVal.goodsId }　${poVal.planSta }${poVal.binId }${poVal.tinId }/${poVal.baoZhiq }${poVal.goodsId }　
diff --git a/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanpcList.jsp b/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanpcList.jsp index c7391341..9d226ba2 100644 --- a/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanpcList.jsp +++ b/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanpcList.jsp @@ -78,7 +78,7 @@ ids.push(rows[i].id); } var url = "tmsYwDingdanController.do?doPrintpage&ids="+ids.join(',');; - createdetailwindow(" 订单明细", url, 1200, 1000); + createdetailwindow(" 订单明细", url, 1400, 1000); // window.open(url); } diff --git a/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanzcList.jsp b/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanzcList.jsp index 44532053..035f20a3 100644 --- a/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanzcList.jsp +++ b/src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanzcList.jsp @@ -44,21 +44,34 @@ - +<%-- --%> <%----%> <%----%> - - + +<%-- --%> <%----%> - +<%-- --%> <%----%>
- + \ No newline at end of file +