zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据打印增加规格

master
e 2019-02-14 22:28:30 +08:00
parent 343e9017a3
commit 0573101c46
7 changed files with 8800 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8699
database/wms-2019-02-14.sql Normal file
View File

File diff suppressed because one or more lines are too long

9
src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
View File

@ -208,6 +208,15 @@ public class WmImNoticeHController extends BaseController {
}
}
try{
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
MvGoodsEntity.class, "goodsCode", wmImNoticeIEntity.getGoodsCode());
if (mvgoods != null) {
wmImNoticeIEntity.setShpGuiGe(mvgoods.getShpGuiGe());
}
}catch (Exception e){
}
wmImNoticeIEntitynewList.add(wmImNoticeIEntity);
}

29
src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
View File

@ -286,6 +286,35 @@ public class WmOmNoticeHController extends BaseController {
}
tom.setBaseGoodscount(StringUtil.getdouble(tom.getBaseGoodscount()));
try{
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
MvGoodsEntity.class, "goodsCode", tom.getGoodsId());
if (mvgoods != null) {
tom.setShpGuiGe(mvgoods.getShpGuiGe());
}
int shpguige = 0;
try{
shpguige = Integer.parseInt(mvgoods.getShpGuiGe());
}catch (Exception e){
}
if(shpguige!=0){
Double xianhshu = Math.floor(Double.parseDouble(tom.getBaseGoodscount())/shpguige);
Double jianshu = Double.parseDouble(tom.getBaseGoodscount())%shpguige;
long xiangshuint = Math.round(xianhshu);
if(xianhshu > 0){
tom.setPickNotice(xiangshuint+"整"+jianshu+tom.getBaseUnit());
}else{
tom.setPickNotice(tom.getBaseGoodscount()+tom.getBaseUnit());
}
}
}catch (Exception e){
}
wmOmQmIEntityListnew.add(tom);
}
}catch ( Exception e){

19
src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java
View File

@ -117,6 +117,8 @@ public class WmImNoticeIEntity implements java.io.Serializable {
private java.lang.String baseQmcount;
@Excel(name="商品条码")
private java.lang.String barCode;
private java.lang.String shpGuiGe;
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@ -660,4 +662,21 @@ public class WmImNoticeIEntity implements java.io.Serializable {
public void setBarCode(java.lang.String barCode){
this.barCode = barCode;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 商品规格
*/
@Column(name ="SHP_GUI_GE",nullable=true,length=32)
public java.lang.String getShpGuiGe(){
return this.shpGuiGe;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 商品规格
*/
public void setShpGuiGe(java.lang.String shpGuiGe){
this.shpGuiGe = shpGuiGe;
}
}

26
src/main/java/com/zzjee/wm/entity/WmOmQmIEntity.java
View File

@ -123,6 +123,8 @@ public class WmOmQmIEntity implements java.io.Serializable {
@Excel(name="保质期")
private java.lang.String baoZhiq;
private java.lang.String shpGuiGe;
private java.lang.String pickNotice;
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@ -669,4 +671,28 @@ public class WmOmQmIEntity implements java.io.Serializable {
public void setBaoZhiq(String baoZhiq) {
this.baoZhiq = baoZhiq;
}
/**
*方法: 取得java.lang.String
*@return: java.lang.String 商品规格
*/
@Column(name ="SHP_GUI_GE",nullable=true,length=32)
public java.lang.String getShpGuiGe(){
return this.shpGuiGe;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String 商品规格
*/
public void setShpGuiGe(java.lang.String shpGuiGe){
this.shpGuiGe = shpGuiGe;
}
@Column(name ="pick_notice",nullable=true,length=32)
public String getPickNotice() {
return pickNotice;
}
public void setPickNotice(String pickNotice) {
this.pickNotice = pickNotice;
}
}

4
src/main/webapp/webpage/com/zzjee/wm/print/imnotice-print.jsp
View File

@ -112,7 +112,7 @@ function printview(){
<col width=94 style='mso-width-source:userset;mso-width-alt:2986;
width:73pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=102 style='mso-width-source:userset;mso-width-alt:2389;width:102pt'>
<col width=102 style='mso-width-source:userset;mso-width-alt:2389;width:60pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
@ -172,7 +172,7 @@ function printview(){
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsPrdData }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.goodsCount }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.shpGuiGe }</td>
<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.barCode }" alt="${poVal.barCode }" style="width:40px;height:40px;vertical-align:middle;">　</td>
<td ></td>

25
src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwu-print.jsp
View File

@ -106,16 +106,20 @@ function printview(){
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
<col width=102 style='mso-width-source:userset;mso-width-alt:3612;width:76pt'>
<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>
<col width=253 style='mso-width-source:userset;mso-width-alt:4010;width:252pt'>
<%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%>
<col width=253 style='mso-width-source:userset;mso-width-alt:4010;width:200pt'>
<col width=45 style='mso-width-source:userset;mso-width-alt:1592;width:34pt'>
<col width=94 style='mso-width-source:userset;mso-width-alt:2986; width:73pt'>
<col width=94 style='mso-width-source:userset;mso-width-alt:2986; width:80pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=102 style='mso-width-source:userset;mso-width-alt:2389;width:102pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:70pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:70pt'>
<col width=67 style='mso-width-source:userset;mso-width-alt:2389;width:50pt'>
<tr height=18 style='height:13.2pt'>
<td colspan=10 height=18 width=585 style='height:13.2pt;width:438pt'></td>
@ -157,16 +161,18 @@ function printview(){
<tr height=33 style='mso-height-source:userset;height:25.05pt'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>储位</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>商品编码</td>
<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>商品名称</td>
<%--<td class=xl65 style='border:1.0pt solid black;text-align: center'>商品编码</td>--%>
<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>商品</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>单位</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>生产日期</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>数量</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>重量</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>体积</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>规格</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>拣货</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>托盘/保质期</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>品质</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>流通码</td>
<td ></td>
@ -177,14 +183,15 @@ function printview(){
<tr height=33 style='mso-height-source:userset;height:50px'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.binId }　</td>
<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsId }</td>
<%--<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsId }</td>--%>
<td class=xl65 style='border:1.0pt solid black;text-align: center;word-break:break-all;'><span style='word-break:break-all;width: auto;font-size: 14pt'>${poVal.goodsName }</span></td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.baseUnit }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.proData }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.baseGoodscount }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.tinZhl }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.tinTj }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.shpGuiGe }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.pickNotice }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.tinId }/${poVal.baoZhiq }</td>
<td class=xl65 align="center" valign="middle" style='border:1.0pt solid black'><img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${poVal.barCode }" alt="${poVal.barCode }" style="width:40px;height:40px;vertical-align:middle;">　</td>
<td ></td>