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

优化

master
zhouxi 2021-09-28 17:39:04 +08:00
parent 73ae9e633a
commit 2185baf2e7
42 changed files with 3181 additions and 2824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zzjee/md/entity/MdGoodsEntity.java
View File

@ -40,9 +40,9 @@ public class MdGoodsEntity implements java.io.Serializable {
/**所属公司*/ /**所属公司*/
private java.lang.String sysCompanyCode; private java.lang.String sysCompanyCode;
/**所属客户*/ /**所属客户*/
@Excel(name="所属客户") @Excel(name="供应商编码")
private java.lang.String suoShuKeHu; private java.lang.String suoShuKeHu;
@Excel(name="客户名称") @Excel(name="供应商名称")
private java.lang.String cusName; private java.lang.String cusName;
@Excel(name="配送点") @Excel(name="配送点")
private java.lang.String peisongdian; private java.lang.String peisongdian;

13
src/main/java/com/zzjee/md/entity/MvGoodsEntity.java
View File

@ -81,6 +81,19 @@ public class MvGoodsEntity implements java.io.Serializable {
private java.lang.String gaoZhXiang; private java.lang.String gaoZhXiang;
@Excel(name="产品属性") @Excel(name="产品属性")
private java.lang.String chpShuXing; private java.lang.String chpShuXing;
@Excel(name="价格")
private java.lang.String gaoDanPin;
@Column(name ="gao_dan_pin",nullable=true,length=100)
public String getGaoDanPin() {
return gaoDanPin;
}
public MvGoodsEntity setGaoDanPin(String gaoDanPin) {
this.gaoDanPin = gaoDanPin;
return this;
}
@Id @Id
@GeneratedValue(generator = "paymentableGenerator") @GeneratedValue(generator = "paymentableGenerator")
@GenericGenerator(name = "paymentableGenerator", strategy = "uuid") @GenericGenerator(name = "paymentableGenerator", strategy = "uuid")

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

File diff suppressed because it is too large Load Diff

7
src/main/java/com/zzjee/wm/controller/WmInQmIController.java
View File

@ -37,6 +37,8 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants;
import org.jeecgframework.tag.core.easyui.TagUtil; import org.jeecgframework.tag.core.easyui.TagUtil;
import org.jeecgframework.web.system.pojo.base.TSBaseUser;
import org.jeecgframework.web.system.pojo.base.TSUser;
import org.jeecgframework.web.system.service.SystemService; import org.jeecgframework.web.system.service.SystemService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -1061,6 +1063,11 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) {
}catch (Exception e){ }catch (Exception e){
} }
} }
//查询create_name
TSBaseUser user = systemService.findUniqueByProperty(TSBaseUser.class,"userName",wmInQmI.getCreateBy());
if (user != null ) {
wmInQmI.setCreateName(user.getRealName());
}
String id = wmInQmIService.save(wmInQmI).toString(); String id = wmInQmIService.save(wmInQmI).toString();
if("on".equals(ResourceUtil.getConfigByName("onestepup"))&&StringUtil.isNotEmpty(wmInQmI.getBinId())){ if("on".equals(ResourceUtil.getConfigByName("onestepup"))&&StringUtil.isNotEmpty(wmInQmI.getBinId())){
toup(id); toup(id);

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

@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validator; import javax.validation.Validator;
import com.zzjee.ba.entity.BaStoreEntity;
import com.zzjee.md.entity.MdGoodsEntity; import com.zzjee.md.entity.MdGoodsEntity;
import com.zzjee.tms.entity.TmsMdCheliangEntity; import com.zzjee.tms.entity.TmsMdCheliangEntity;
import com.zzjee.tms.entity.TmsYwDingdanEntity; import com.zzjee.tms.entity.TmsYwDingdanEntity;
@ -23,6 +24,7 @@ import com.zzjee.wm.entity.*;
import com.zzjee.wm.page.*; import com.zzjee.wm.page.*;
import com.zzjee.wmutil.dsc.dscUtil; import com.zzjee.wmutil.dsc.dscUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
@ -222,6 +224,13 @@ public class WmOmNoticeHController extends BaseController {
request.setAttribute("noticeid", wmOmNoticeHEntity.getOmNoticeId()); request.setAttribute("noticeid", wmOmNoticeHEntity.getOmNoticeId());
} }
BaStoreEntity baStoreEntity = systemService.findUniqueByProperty(BaStoreEntity.class,"storeCode",wmOmNoticeHEntity.getStoreCode());
if (baStoreEntity != null && StringUtils.isNotEmpty(baStoreEntity.getStoreName())) {
request.setAttribute("storeName", baStoreEntity.getStoreName());
}else {
request.setAttribute("storeName", "");
}
try{ try{
MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeHEntity.getCusCode()); MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeHEntity.getCusCode());
MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeHEntity.getOcusCode()); MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeHEntity.getOcusCode());
@ -325,8 +334,12 @@ public class WmOmNoticeHController extends BaseController {
@RequestMapping(params = "doPrintOutStorage") @RequestMapping(params = "doPrintOutStorage")
public ModelAndView doPrintOutStorage(String id,HttpServletRequest request) { public ModelAndView doPrintOutStorage(String id,HttpServletRequest request) {
WmOmNoticeHEntity wmOmNoticeHEntity = wmOmNoticeHService.getEntity(WmOmNoticeHEntity.class, id); WmOmNoticeHEntity wmOmNoticeHEntity = wmOmNoticeHService.getEntity(WmOmNoticeHEntity.class, id);
List<Map<String,Object>> list = new ArrayList<>();
list = wmOmNoticeHService.findForJdbc("select id,goods_id ,goods_name ,base_goodscount,goods_unit from wm_to_down_goods where order_id = ? ",wmOmNoticeHEntity.getOmNoticeId());
if (list.size() == 0 ) {
list = systemService.findForJdbc("select id,goods_id ,goods_name ,base_goodscount,goods_unit from wm_om_qm_i where om_notice_id = ? ",wmOmNoticeHEntity.getOmNoticeId());
}
List<Map<String,Object>> list = wmOmNoticeHService.findForJdbc("select id,goods_id ,goods_name ,base_goodscount,goods_unit from wm_to_down_goods where order_id = ? ",wmOmNoticeHEntity.getOmNoticeId());
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
List<WmToDownGoodsEntity> resultList = new ArrayList<>(); List<WmToDownGoodsEntity> resultList = new ArrayList<>();
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
@ -362,6 +375,13 @@ public class WmOmNoticeHController extends BaseController {
request.setAttribute("noticeid", wmOmNoticeHEntity.getOmNoticeId()); request.setAttribute("noticeid", wmOmNoticeHEntity.getOmNoticeId());
} }
BaStoreEntity baStoreEntity = systemService.findUniqueByProperty(BaStoreEntity.class,"storeCode",wmOmNoticeHEntity.getStoreCode());
if (baStoreEntity != null && StringUtils.isNotEmpty(baStoreEntity.getStoreName())) {
request.setAttribute("storeName", baStoreEntity.getStoreName());
}else {
request.setAttribute("storeName", "");
}
try{ try{
MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeHEntity.getCusCode()); MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeHEntity.getCusCode());
MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeHEntity.getOcusCode()); MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeHEntity.getOcusCode());
@ -941,8 +961,12 @@ public class WmOmNoticeHController extends BaseController {
if(!StringUtil.isEmpty(wmomNoticeIEntity.getGoodsId())){ if(!StringUtil.isEmpty(wmomNoticeIEntity.getGoodsId())){
try { try {
String goodsId = wmomNoticeIEntity.getGoodsId().split("-")[0];
if(goodsId.endsWith("l")){
goodsId = goodsId.substring(0,goodsId.lastIndexOf("l"));
}
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(MvGoodsEntity.class,"goodsId",wmomNoticeIEntity.getGoodsId().split("-")[0]); MvGoodsEntity mvgoods = systemService.findUniqueByProperty(MvGoodsEntity.class,"goodsId",goodsId);
// String date[]=wmImNoticeIEntity.getGoodsCode().split("-"); // String date[]=wmImNoticeIEntity.getGoodsCode().split("-");
// wmImNoticeIEntity.setGoodsCode(mvgoods.getGoodsCode()); // wmImNoticeIEntity.setGoodsCode(mvgoods.getGoodsCode());
@ -1548,9 +1572,9 @@ public class WmOmNoticeHController extends BaseController {
// String tsql = "SELECT wq.pro_data,wq.base_unit,wq.rec_deg, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,cast(sum(wq.tin_tj) as signed) tin_tj ,cast(sum(wq.tin_zhl) as signed) tin_zhl " // String tsql = "SELECT wq.pro_data,wq.base_unit,wq.rec_deg, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,cast(sum(wq.tin_tj) as signed) tin_tj ,cast(sum(wq.tin_zhl) as signed) tin_zhl "
// +" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? " // +" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? "
// +" and wq.goods_id = mg.goods_code group by wq.om_notice_id, mg.goods_code,wq.pro_data"; // +" and wq.goods_id = mg.goods_code group by wq.om_notice_id, mg.goods_code,wq.pro_data";
String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_unit, mg.goods_code,mg.shp_gui_ge, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl " String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_goodscount,wq.base_unit,mg.gao_dan_pin, mg.goods_code,mg.shp_gui_ge, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl "
+" FROM wm_to_down_goods wq,mv_goods mg where wq.order_id = ? " +" FROM wm_to_down_goods wq,mv_goods mg where wq.order_id = ? "
+" and wq.goods_id = mg.goods_code group by wq.order_id, mg.goods_code,wq.goods_pro_data"; +" and wq.goods_id = mg.goods_id group by wq.order_id, mg.goods_code,wq.goods_pro_data";
List<Map<String, Object>> result = systemService List<Map<String, Object>> result = systemService
.findForJdbc(tsql, wmOmNoticeH.getOmNoticeId()); .findForJdbc(tsql, wmOmNoticeH.getOmNoticeId());
@ -1558,9 +1582,9 @@ public class WmOmNoticeHController extends BaseController {
int size = result.size(); int size = result.size();
if(size<1){ if(size<1){
tsql = "SELECT wq.pro_data,wq.base_unit, mg.goods_code,mg.shp_gui_ge, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl " tsql = "SELECT wq.pro_data,wq.base_unit,wq.base_goodscount, mg.goods_code,mg.shp_gui_ge,mg.gao_dan_pin, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl "
+" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? " +" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? "
+" and wq.goods_id = mg.goods_code group by wq.om_notice_id, mg.goods_code,wq.pro_data"; +" and wq.goods_id = mg.goods_id group by wq.om_notice_id, mg.goods_code,wq.pro_data";
result = systemService result = systemService
.findForJdbc(tsql, wmOmNoticeH.getOmNoticeId()); .findForJdbc(tsql, wmOmNoticeH.getOmNoticeId());
size = result.size(); size = result.size();
@ -1591,14 +1615,22 @@ public class WmOmNoticeHController extends BaseController {
cellTitle.setCellValue("配送单"); cellTitle.setCellValue("配送单");
cellTitle.setCellStyle(cs); cellTitle.setCellStyle(cs);
BaStoreEntity baStoreEntity = systemService.findUniqueByProperty(BaStoreEntity.class,"storeCode",wmOmNoticeH.getStoreCode());
Row row2 = sheet.createRow((short) page*20+1); // 第二行标题 Row row2 = sheet.createRow((short) page*20+1); // 第二行标题
//row2.setHeight((short) 700); //row2.setHeight((short) 700);
Cell cellTitle2 = row2.createCell(0); Cell cellTitle20 = row2.createCell(0);
if (baStoreEntity != null) {
cellTitle20.setCellValue("仓库："+(StringUtils.isEmpty(baStoreEntity.getStoreName())?"":baStoreEntity.getStoreName()));
}else {
cellTitle20.setCellValue("仓库：");
}
cellTitle20.setCellStyle(cs1);
Cell cellTitle2 = row2.createCell(3);
cellTitle2.setCellValue("销售部门："); cellTitle2.setCellValue("销售部门：");
cellTitle2.setCellStyle(cs1); cellTitle2.setCellStyle(cs1);
Cell cellTitle21 = row2.createCell(3); Cell cellTitle21 = row2.createCell(6);
cellTitle21.setCellValue("送货方式：仓库自提"); cellTitle21.setCellValue("送货方式："+ (StringUtils.isEmpty(wmOmNoticeH.getDelvMethod())?"":wmOmNoticeH.getDelvMethod()));
cellTitle21.setCellStyle(cs1); cellTitle21.setCellStyle(cs1);
Row row3 = sheet.createRow((short) page*20+2); // 第二行标题 Row row3 = sheet.createRow((short) page*20+2); // 第二行标题
@ -1613,6 +1645,7 @@ public class WmOmNoticeHController extends BaseController {
cellTitle33.setCellValue("销售日期："); cellTitle33.setCellValue("销售日期：");
cellTitle33.setCellStyle(cs1); cellTitle33.setCellStyle(cs1);
MdCusEntity md = systemService.findUniqueByProperty(MdCusEntity.class, "keHuBianMa", wmOmNoticeH.getCusCode()); MdCusEntity md = systemService.findUniqueByProperty(MdCusEntity.class, "keHuBianMa", wmOmNoticeH.getCusCode());
Row row4 = sheet.createRow((short) page*20+3); // 第二行标题 Row row4 = sheet.createRow((short) page*20+3); // 第二行标题
//row4.setHeight((short) 700); //row4.setHeight((short) 700);
@ -1623,7 +1656,7 @@ public class WmOmNoticeHController extends BaseController {
cellTitle42.setCellValue("客户名称："+wmOmNoticeH.getOcusName() == null ?"":wmOmNoticeH.getOcusName()); cellTitle42.setCellValue("客户名称："+wmOmNoticeH.getOcusName() == null ?"":wmOmNoticeH.getOcusName());
cellTitle42.setCellStyle(cs1); cellTitle42.setCellStyle(cs1);
Cell cellTitle43 = row4.createCell(6); Cell cellTitle43 = row4.createCell(6);
cellTitle43.setCellValue("送货日期："+DateUtils.date2Str(wmOmNoticeH.getDelvData(), DateUtils.date_sdf)); cellTitle43.setCellValue("送货日期："+wmOmNoticeH.getDelvData() == null?"":DateUtils.date2Str(wmOmNoticeH.getDelvData(), DateUtils.date_sdf));
cellTitle43.setCellStyle(cs1); cellTitle43.setCellStyle(cs1);
//MdCusOtherEntity cusOther = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeH.getOcusCode()); //MdCusOtherEntity cusOther = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeH.getOcusCode());
@ -1643,7 +1676,7 @@ public class WmOmNoticeHController extends BaseController {
Row row6 = sheet.createRow((short) page*20+5); // 第二行标题 Row row6 = sheet.createRow((short) page*20+5); // 第二行标题
//row6.setHeight((short) 700); //row6.setHeight((short) 700);
Cell cellTitle61 = row6.createCell(0); Cell cellTitle61 = row6.createCell(0);
cellTitle61.setCellValue("送货地址："+wmOmNoticeH.getDelvAddr()); cellTitle61.setCellValue("送货地址："+wmOmNoticeH.getDelvAddr() == null ?"":wmOmNoticeH.getDelvAddr());
cellTitle61.setCellStyle(cs1); cellTitle61.setCellStyle(cs1);
Row row7 = sheet.createRow((short) page*20+6); // 第二行标题 Row row7 = sheet.createRow((short) page*20+6); // 第二行标题
@ -1766,7 +1799,7 @@ public class WmOmNoticeHController extends BaseController {
Row rowColumnName = sheet.createRow((short) page*20+7); // 列名 Row rowColumnName = sheet.createRow((short) page*20+7); // 列名
String[] columnNames = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","体积/cm³","备注" }; String[] columnNames = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","体积/cm³","备注" };
String[] columnNames2 = { "物料", "物料名称", "型号", "批次", "规格","数量", "重量", "体积","库区","备注" }; String[] columnNames2 = { "物料", "物料名称", "单价", "批次", "规格","数量", "重量", "体积","库区","备注" };
try{ try{
if("hr".equals(ResourceUtil.getConfigByName("wm.ckd"))){ if("hr".equals(ResourceUtil.getConfigByName("wm.ckd"))){
// String[] columnNames1 = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","库存","备注" }; // String[] columnNames1 = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","库存","备注" };
@ -1810,8 +1843,7 @@ public class WmOmNoticeHController extends BaseController {
cell2.setCellStyle(cs5); cell2.setCellStyle(cs5);
Cell cell3 = rowColumnValue.createCell(2); Cell cell3 = rowColumnValue.createCell(2);
// cell3.setCellValue(result.get(i).get("shp_ming_cheng") cell3.setCellValue(result.get(i).get("gao_dan_pin").toString());
// .toString());
// cell3.setCellValue("0"); // cell3.setCellValue("0");
cell3.setCellStyle(cs5); cell3.setCellStyle(cs5);
try { try {
@ -1821,8 +1853,7 @@ public class WmOmNoticeHController extends BaseController {
// cell4.setCellValue(result.get(i).get("pro_data") // cell4.setCellValue(result.get(i).get("pro_data")
// .toString()); // .toString());
cell4.setCellValue("无"); cell4.setCellValue("");
cell4.setCellStyle(cs5r); cell4.setCellStyle(cs5r);
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
@ -1842,13 +1873,12 @@ public class WmOmNoticeHController extends BaseController {
try { try {
long xs = (long) Math.floor(Double.parseDouble(result.get(i).get("goods_count") long xs = (long) Math.floor(Double.parseDouble(result.get(i).get("base_goodscount")
.toString()) / Double.parseDouble(result.get(i).get("chl_shl")
.toString())); .toString()));
sumxs = sumxs + xs; sumxs = sumxs + xs;
Cell cell6 = rowColumnValue.createCell(5);// 单位 Cell cell6 = rowColumnValue.createCell(5);// 单位
// cell6.setCellValue(xs); // cell6.setCellValue(xs);
cell6.setCellValue(sumxs); cell6.setCellValue(xs);
cell6.setCellStyle(cs5); cell6.setCellStyle(cs5);
} catch (Exception e) { } catch (Exception e) {
@ -1862,11 +1892,11 @@ public class WmOmNoticeHController extends BaseController {
// .toString()); // .toString());
// sum = sum + bs; // sum = sum + bs;
double zhl = Double.parseDouble(result.get(i).get("tin_zhl") double zhl = Double.parseDouble(result.get(i).get("tin_zhl")
.toString()) * Double.parseDouble(result.get(i).get("goods_count").toString()); .toString());
sumzl = sumzl + zhl; sumzl = sumzl + zhl;
Cell cell7 = rowColumnValue.createCell(6);// 数量 Cell cell7 = rowColumnValue.createCell(6);// 数量
// cell7.setCellValue(bs); // cell7.setCellValue(bs);
cell7.setCellValue(sumzl); cell7.setCellValue(zhl);
cell7.setCellStyle(cs5); cell7.setCellStyle(cs5);
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
@ -1927,14 +1957,15 @@ public class WmOmNoticeHController extends BaseController {
cell5.setCellStyle(cs5); cell5.setCellStyle(cs5);
Cell cell6 = rowColumnValue.createCell(6);// 备注 Cell cell6 = rowColumnValue.createCell(6);// 备注
cell6.setCellValue(Double.toString(sumzl)); cell6.setCellValue(Double.toString(sumzl));
// cell6.setCellValue("");
cell5.setCellStyle(cs5); cell5.setCellStyle(cs5);
Cell cell7 = rowColumnValue.createCell(7);// 重量合计 Cell cell7 = rowColumnValue.createCell(7);//
cell7.setCellValue(""); cell7.setCellValue("");
cell7.setCellStyle(cs5); cell7.setCellStyle(cs5);
Cell cell8 = rowColumnValue.createCell(8);// 重量合计 Cell cell8 = rowColumnValue.createCell(8);//
cell8.setCellValue(""); cell8.setCellValue("");
cell8.setCellStyle(cs5); cell8.setCellStyle(cs5);
Cell cell9 = rowColumnValue.createCell(9);// 重量合计 Cell cell9 = rowColumnValue.createCell(9);//
cell9.setCellValue(""); cell9.setCellValue("");
cell9.setCellStyle(cs5); cell9.setCellStyle(cs5);
// cell6.setCellStyle(cs5); // cell6.setCellStyle(cs5);
@ -2064,18 +2095,18 @@ public class WmOmNoticeHController extends BaseController {
id);//获取抬头 id);//获取抬头
printHeader.setHeader01(ResourceUtil.getConfigByName("comname")+"出库单"); printHeader.setHeader01("配送单");
printHeader.setHeader02("公司地址："+ResourceUtil.getConfigByName("comaddr") ); printHeader.setHeader02("公司地址："+ResourceUtil.getConfigByName("comaddr") );
printHeader.setHeader03("电话："+ ResourceUtil.getConfigByName("comtel")); printHeader.setHeader03("电话："+ ResourceUtil.getConfigByName("comtel"));
printHeader.setHeader04("出库日期： " +DateUtils.date2Str(wmOmNoticeH.getDelvData(), DateUtils.date_sdf) ); printHeader.setHeader04("送货日期： " +(wmOmNoticeH.getDelvData() == null ?"":DateUtils.date2Str(wmOmNoticeH.getDelvData(), DateUtils.date_sdf)));
printHeader.setHeader05("出库单号： " +wmOmNoticeH.getOmNoticeId()); printHeader.setHeader05("出库单号： " +wmOmNoticeH.getOmNoticeId());
printHeader.setHeader06("客户单号： " +wmOmNoticeH.getImCusCode()); printHeader.setHeader06("参考单号： " +wmOmNoticeH.getImCusCode());
printHeader.setHeader07("车号： " +wmOmNoticeH.getReCarno()); printHeader.setHeader07("车号： " +wmOmNoticeH.getReCarno());
@ -2084,18 +2115,32 @@ public class WmOmNoticeHController extends BaseController {
printHeader.setHeader08("客户名称： " +wmOmNoticeH.getCusCode()+md.getZhongWenQch()); printHeader.setHeader08("客户名称： " +wmOmNoticeH.getCusCode()+md.getZhongWenQch());
printHeader.setHeader09("收货人： "+wmOmNoticeH.getDelvMember()+" 电话:"+wmOmNoticeH.getDelvMobile() ); printHeader.setHeader09("联系人： "+wmOmNoticeH.getDelvMember());
printHeader.setHeader10("收货地址： " +wmOmNoticeH.getDelvAddr()); printHeader.setHeader10("送货地址： " +wmOmNoticeH.getDelvAddr());
printHeader.setHeader11("打印时间： "+DateUtils.date2Str(DateUtils.getDate(), DateUtils.datetimeFormat) ); printHeader.setHeader11("打印时间： "+DateUtils.date2Str(DateUtils.getDate(), DateUtils.datetimeFormat) );
printHeader.setHeader14("备注： " +wmOmNoticeH.getOmBeizhu()); printHeader.setHeader14("销售部门： " );
printHeader.setHeader15("送货方式： "+(StringUtils.isEmpty(wmOmNoticeH.getDelvMethod())?"":wmOmNoticeH.getDelvMethod()) );
printHeader.setHeader16("备注： " +wmOmNoticeH.getOmBeizhu());
printHeader.setHeader17("销售员： ");
printHeader.setHeader18("销售员电话： ");
printHeader.setHeader19("销售日期： ");
printHeader.setHeader20("客户电话： "+wmOmNoticeH.getDelvMobile());
BaStoreEntity baStoreEntity = systemService.findUniqueByProperty(BaStoreEntity.class,"storeCode",wmOmNoticeH.getStoreCode());
if (baStoreEntity != null){
printHeader.setHeader21("仓库： " +(StringUtils.isEmpty(baStoreEntity.getStoreName())?"":baStoreEntity.getStoreName()));
}else {
printHeader.setHeader21("仓库： ");
}
List<PrintItem> listitem = new ArrayList<>(); List<PrintItem> listitem = new ArrayList<>();
String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl " String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_goodscount,wq.base_unit,mg.gao_dan_pin, mg.goods_code,mg.shp_gui_ge, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl "
+" FROM wm_to_down_goods wq,mv_goods mg where wq.id in (?) " +" FROM wm_to_down_goods wq,mv_goods mg where wq.id in (?) "
+" and wq.goods_id = mg.goods_code group by wq.order_id, mg.goods_code,wq.goods_pro_data"; +" and wq.goods_id = mg.goods_id group by wq.order_id, mg.goods_code,wq.goods_pro_data";
List<Map<String, Object>> result = systemService List<Map<String, Object>> result = systemService
.findForJdbc(tsql, itemId); .findForJdbc(tsql, itemId);
@ -2103,9 +2148,9 @@ public class WmOmNoticeHController extends BaseController {
int size = result.size(); int size = result.size();
if(size<1){ if(size<1){
tsql = "SELECT wq.pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl " tsql = "SELECT wq.pro_data,wq.base_unit,wq.base_goodscount,mg.shp_gui_ge,mg.gao_dan_pin, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl "
+" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? " +" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? "
+" and wq.goods_id = mg.goods_code group by wq.om_notice_id, mg.goods_code,wq.pro_data"; +" and wq.goods_id = mg.goods_id group by wq.om_notice_id, mg.goods_code,wq.pro_data";
result = systemService result = systemService
.findForJdbc(tsql, wmOmNoticeH.getOmNoticeId()); .findForJdbc(tsql, wmOmNoticeH.getOmNoticeId());
size = result.size(); size = result.size();
@ -2135,8 +2180,7 @@ public class WmOmNoticeHController extends BaseController {
try { try {
long xs = (long) Math.floor(Double.parseDouble(result.get(i).get("goods_count") long xs = (long) Math.floor(Double.parseDouble(result.get(i).get("base_goodscount")
.toString()) / Double.parseDouble(result.get(i).get("chl_shl")
.toString())); .toString()));
sumxs = sumxs + xs; sumxs = sumxs + xs;
printItem.setItem05(Long.toString(xs)); printItem.setItem05(Long.toString(xs));
@ -2159,7 +2203,7 @@ public class WmOmNoticeHController extends BaseController {
double zhl = Double.parseDouble(result.get(i).get("tin_zhl") double zhl = Double.parseDouble(result.get(i).get("tin_zhl")
.toString()) * Double.parseDouble(result.get(i).get("goods_count").toString()); .toString()) * Double.parseDouble(result.get(i).get("goods_count").toString());
sumzl = sumzl + zhl; sumzl = sumzl + zhl;
printItem.setItem07(Double.toString(zhl)); printItem.setItem07("");
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
@ -2179,7 +2223,14 @@ public class WmOmNoticeHController extends BaseController {
}catch (Exception e){ }catch (Exception e){
logger.error(ExceptionUtil.getExceptionMessage(e)); logger.error(ExceptionUtil.getExceptionMessage(e));
} }
printItem.setItem10(result.get(i).get("shp_gui_ge")
.toString());
try{
printItem.setItem11(result.get(i).get("gao_dan_pin")
.toString());
}catch (Exception e){
logger.error(ExceptionUtil.getExceptionMessage(e));
}
listitem.add(printItem); listitem.add(printItem);
} }
@ -2233,7 +2284,7 @@ public class WmOmNoticeHController extends BaseController {
String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl " String tsql = "SELECT wq.goods_pro_data as pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj ,(mg.zhl_kg/mg.chl_shl ) as tin_zhl "
+" FROM wm_to_down_goods wq,mv_goods mg where wq.order_id = ? " +" FROM wm_to_down_goods wq,mv_goods mg where wq.order_id = ? "
+" and wq.goods_id = mg.goods_code group by wq.order_id, mg.goods_code,wq.goods_pro_data"; +" and wq.goods_id = mg.goods_id group by wq.order_id, mg.goods_code,wq.goods_pro_data";
List<Map<String, Object>> result = systemService List<Map<String, Object>> result = systemService
.findForJdbc(tsql, wmOmNoticeH.getOmNoticeId()); .findForJdbc(tsql, wmOmNoticeH.getOmNoticeId());
@ -2243,7 +2294,7 @@ public class WmOmNoticeHController extends BaseController {
if(size<1){ if(size<1){
tsql = "SELECT wq.pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl " tsql = "SELECT wq.pro_data,wq.base_unit, mg.goods_code, mg.goods_id,mg.shp_ming_cheng,cast(sum(wq.base_goodscount) as signed) as goods_count,mg.chl_shl,cast(mg.ti_ji_cm/mg.chl_shl as signed) tin_tj , (mg.zhl_kg/mg.chl_shl) as tin_zhl "
+" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? " +" FROM wm_om_qm_i wq,mv_goods mg where wq.om_notice_id = ? "
+" and wq.goods_id = mg.goods_code group by wq.om_notice_id, mg.goods_code,wq.pro_data"; +" and wq.goods_id = mg.goods_id group by wq.om_notice_id, mg.goods_code,wq.pro_data";
result = systemService result = systemService
.findForJdbc(tsql, wmOmNoticeH.getOmNoticeId()); .findForJdbc(tsql, wmOmNoticeH.getOmNoticeId());
size = result.size(); size = result.size();
@ -2533,12 +2584,12 @@ public class WmOmNoticeHController extends BaseController {
} }
if(roles.equals("CUS")){ if(roles.equals("CUS")){
cq.eq("cusCode", user.getUserName()); cq.eq("cusCode", user.getUserName());
} }
} }
//自定义追加查询条件 //自定义追加查询条件
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace();
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
cq.add(); cq.add();

3
src/main/java/com/zzjee/wm/controller/WmSttInGoodsController.java
View File

@ -2,6 +2,7 @@ package com.zzjee.wm.controller;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -612,8 +613,10 @@ public class WmSttInGoodsController extends BaseController {
//保存 //保存
try{ try{
WmSttInGoodsEntity t = systemService.get(WmSttInGoodsEntity.class,wmSttInGoods.getId()); WmSttInGoodsEntity t = systemService.get(WmSttInGoodsEntity.class,wmSttInGoods.getId());
MyBeanUtils.copyBeanNotNull2Bean(wmSttInGoods,t); MyBeanUtils.copyBeanNotNull2Bean(wmSttInGoods,t);
t.setSttSta(Constants.wm_sta4); t.setSttSta(Constants.wm_sta4);
t.setUpdateDate(new Date());
wmSttInGoodsService.saveOrUpdate(t); wmSttInGoodsService.saveOrUpdate(t);
D0.setOK(true); D0.setOK(true);
} catch (Exception e) { } catch (Exception e) {

7
src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java
View File

@ -33,6 +33,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants;
import org.jeecgframework.tag.core.easyui.TagUtil; import org.jeecgframework.tag.core.easyui.TagUtil;
import org.jeecgframework.web.system.pojo.base.TSBaseUser;
import org.jeecgframework.web.system.service.SystemService; import org.jeecgframework.web.system.service.SystemService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -498,6 +499,12 @@ public class WmToUpGoodsController extends BaseController {
wmToUpGoods.setGoodsName(wmInQmIEntity.getGoodsName()); wmToUpGoods.setGoodsName(wmInQmIEntity.getGoodsName());
wmToUpGoods.setCreateDate(DateUtils.getDate()); wmToUpGoods.setCreateDate(DateUtils.getDate());
TSBaseUser user = systemService.findUniqueByProperty(TSBaseUser.class,"userName",wmToUpGoods.getCreateBy());
if (user != null ) {
wmToUpGoods.setCreateName(user.getRealName());
}
wmToUpGoodsService.save(wmToUpGoods); wmToUpGoodsService.save(wmToUpGoods);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

4
src/main/java/com/zzjee/wm/controller/WmsApiController.java
View File

@ -117,8 +117,8 @@ public class WmsApiController {
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq,
mdGoods, request.getParameterMap()); mdGoods, request.getParameterMap());
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){ if(StringUtil.isNotEmpty(mdGoods.getSuoShuKeHu())){
cq.eq("suoShuKeHu", wmUtil.getCusCode()); cq.eq("suoShuKeHu", mdGoods.getSuoShuKeHu());
} }
if(StringUtil.isNotEmpty(mdGoods.getShpBianMakh())){ if(StringUtil.isNotEmpty(mdGoods.getShpBianMakh())){
cq.eq("shpBianMakh", mdGoods.getShpBianMakh()); cq.eq("shpBianMakh", mdGoods.getShpBianMakh());

10
src/main/java/com/zzjee/wm/entity/PrintHeader.java
View File

@ -21,6 +21,16 @@ public class PrintHeader {
private String header18; private String header18;
private String header19; private String header19;
private String header20; private String header20;
private String header21;
public String getHeader21() {
return header21;
}
public PrintHeader setHeader21(String header21) {
this.header21 = header21;
return this;
}
public String getHeader01() { public String getHeader01() {
return header01; return header01;

15
src/main/java/com/zzjee/wm/entity/WmImNoticeHEntity.java
View File

@ -61,7 +61,7 @@ public class WmImNoticeHEntity implements java.io.Serializable {
private java.lang.String sysCompanyCode; private java.lang.String sysCompanyCode;
/**客户编码*/ /**客户编码*/
@Excel(name="客户编码") @Excel(name="供应商编码")
private java.lang.String cusCode; private java.lang.String cusCode;
/**预计到货时间*/ /**预计到货时间*/
@Excel(name="预计到货时间",format = "yyyy-MM-dd") @Excel(name="预计到货时间",format = "yyyy-MM-dd")
@ -108,6 +108,19 @@ public class WmImNoticeHEntity implements java.io.Serializable {
private java.lang.String piClass; private java.lang.String piClass;
private java.lang.String piMaster; private java.lang.String piMaster;
@Column(name ="store_code",length=50)
public String getStoreCode() {
return storeCode;
}
public WmImNoticeHEntity setStoreCode(String storeCode) {
this.storeCode = storeCode;
return this;
}
private String storeCode;
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 主键 *@return: java.lang.String 主键

31
src/main/java/com/zzjee/wm/entity/WmOmNoticeHEntity.java
View File

@ -59,7 +59,7 @@ public class WmOmNoticeHEntity implements java.io.Serializable {
private java.lang.String sysCompanyCode; private java.lang.String sysCompanyCode;
/**客户*/ /**客户*/
@Excel(name="客户") @Excel(name="供应商编码")
private java.lang.String cusCode; private java.lang.String cusCode;
/**客户订单号*/ /**客户订单号*/
@Excel(name="客户订单号") @Excel(name="客户订单号")
@ -100,10 +100,10 @@ public class WmOmNoticeHEntity implements java.io.Serializable {
/**附件*/ /**附件*/
private java.lang.String fuJian; private java.lang.String fuJian;
@Excel(name="三方客户编号") @Excel(name="客户编号")
private java.lang.String ocusCode; private java.lang.String ocusCode;
@Excel(name="三方客户名称") @Excel(name="客户名称")
private java.lang.String ocusName; private java.lang.String ocusName;
private java.lang.String printStatus; private java.lang.String printStatus;
@ -111,6 +111,31 @@ public class WmOmNoticeHEntity implements java.io.Serializable {
private java.lang.String piClass; private java.lang.String piClass;
private java.lang.String piMaster; private java.lang.String piMaster;
@Excel(name = "送货方式")
private String delvMethod;
private String storeCode;
@Column(name ="store_code",nullable=true,length=50)
public String getStoreCode() {
return storeCode;
}
public WmOmNoticeHEntity setStoreCode(String storeCode) {
this.storeCode = storeCode;
return this;
}
@Column(name ="delv_method",nullable=true,length=32)
public String getDelvMethod() {
return delvMethod;
}
public WmOmNoticeHEntity setDelvMethod(String delvMethod) {
this.delvMethod = delvMethod;
return this;
}
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String

4
src/main/java/com/zzjee/wm/entity/WmSttInGoodsEntity.java
View File

@ -91,10 +91,10 @@ public class WmSttInGoodsEntity implements java.io.Serializable {
@Excel(name="盘点数量") @Excel(name="盘点数量")
private java.lang.String sttQua; private java.lang.String sttQua;
/**客户名称*/ /**客户名称*/
@Excel(name="客户名称") @Excel(name="货主名称")
private java.lang.String cusName; private java.lang.String cusName;
/**客户*/ /**客户*/
@Excel(name="客户") @Excel(name="货主编码")
private java.lang.String cusCode; private java.lang.String cusCode;
/**盘点状态*/ /**盘点状态*/
@Excel(name="盘点状态") @Excel(name="盘点状态")

40
src/main/java/com/zzjee/wm/page/WmOmNoticeHPage.java
View File

@ -59,41 +59,76 @@ public class WmOmNoticeHPage implements java.io.Serializable {
private java.lang.String sysCompanyCode; private java.lang.String sysCompanyCode;
/**客户*/ /**客户*/
@Excel(name="供应商编码")
private java.lang.String cusCode; private java.lang.String cusCode;
/**要求交货时间*/ /**要求交货时间*/
@Excel(name="要求交货时间",format = "yyyy-MM-dd")
private java.util.Date delvData; private java.util.Date delvData;
/**收货人*/ /**收货人*/
@Excel(name="收货人")
private java.lang.String delvMember; private java.lang.String delvMember;
/**收货人电话*/ /**收货人电话*/
@Excel(name="收货人电话")
private java.lang.String delvMobile; private java.lang.String delvMobile;
/**收货人地址*/ /**收货人地址*/
@Excel(name="收货人地址")
private java.lang.String delvAddr; private java.lang.String delvAddr;
/**承运人*/ /**承运人*/
@Excel(name="承运人")
private java.lang.String reMember; private java.lang.String reMember;
/**承运人电话*/ /**承运人电话*/
@Excel(name="承运人电话")
private java.lang.String reMobile; private java.lang.String reMobile;
/**承运人车号*/ /**承运人车号*/
@Excel(name="承运人车号")
private java.lang.String reCarno; private java.lang.String reCarno;
/**发货月台*/ /**发货月台*/
private java.lang.String omPlatNo; private java.lang.String omPlatNo;
/**备注*/ /**备注*/
@Excel(name="备注")
private java.lang.String omBeizhu; private java.lang.String omBeizhu;
/**状态*/ /**状态*/
private java.lang.String omSta; private java.lang.String omSta;
/**出货单号*/ /**出货单号*/
@Excel(name="出货单号",width = 30)
private java.lang.String omNoticeId; private java.lang.String omNoticeId;
/**附件*/ /**附件*/
private java.lang.String fuJian; private java.lang.String fuJian;
@Excel(name="客户编号")
private java.lang.String ocusCode; private java.lang.String ocusCode;
@Excel(name="客户名称")
private java.lang.String ocusName; private java.lang.String ocusName;
@Excel(name="客户订单号")
private java.lang.String imCusCode; private java.lang.String imCusCode;
private java.lang.String printStatus; private java.lang.String printStatus;
private java.lang.String piClass; private java.lang.String piClass;
private java.lang.String piMaster; private java.lang.String piMaster;
@Excel(name = "送货方式")
private String delvMethod;
private String storeCode;
public String getDelvMethod() {
return delvMethod;
}
public WmOmNoticeHPage setDelvMethod(String delvMethod) {
this.delvMethod = delvMethod;
return this;
}
public String getStoreCode() {
return storeCode;
}
public WmOmNoticeHPage setStoreCode(String storeCode) {
this.storeCode = storeCode;
return this;
}
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 主键 *@return: java.lang.String 主键
@ -500,6 +535,7 @@ public class WmOmNoticeHPage implements java.io.Serializable {
} }
/**保存-出货通知项目*/ /**保存-出货通知项目*/
@ExcelCollection(name = "出货通知项目")
private List<WmOmNoticeIEntity> wmOmNoticeIList = new ArrayList<WmOmNoticeIEntity>(); private List<WmOmNoticeIEntity> wmOmNoticeIList = new ArrayList<WmOmNoticeIEntity>();
public List<WmOmNoticeIEntity> getWmOmNoticeIList() { public List<WmOmNoticeIEntity> getWmOmNoticeIList() {
return wmOmNoticeIList; return wmOmNoticeIList;

3
src/main/java/com/zzjee/wm/service/WmToUpGoodsServiceI.java
View File

@ -1,6 +1,9 @@
package com.zzjee.wm.service; package com.zzjee.wm.service;
import com.zzjee.wm.entity.WmToUpGoodsEntity; import com.zzjee.wm.entity.WmToUpGoodsEntity;
import org.jeecgframework.core.common.service.CommonService; import org.jeecgframework.core.common.service.CommonService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.util.UriComponentsBuilder;
import java.io.Serializable; import java.io.Serializable;

20
src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java
View File

@ -1,22 +1,42 @@
package com.zzjee.wm.service.impl; package com.zzjee.wm.service.impl;
import com.zzjee.api.ResultDO;
import com.zzjee.wm.entity.WmInQmIEntity;
import com.zzjee.wm.service.WmToUpGoodsServiceI; import com.zzjee.wm.service.WmToUpGoodsServiceI;
import com.zzjee.wmutil.wmUtil;
import org.jeecgframework.core.beanvalidator.BeanValidators;
import org.jeecgframework.core.common.service.impl.CommonServiceImpl; import org.jeecgframework.core.common.service.impl.CommonServiceImpl;
import com.zzjee.wm.entity.WmToUpGoodsEntity; import com.zzjee.wm.entity.WmToUpGoodsEntity;
import org.jeecgframework.core.util.DateUtils;
import org.jeecgframework.core.util.JSONHelper;
import org.jeecgframework.web.system.pojo.base.TSBaseUser;
import org.jeecgframework.web.system.service.SystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.io.Serializable; import java.io.Serializable;
import org.jeecgframework.core.util.ApplicationContextUtil; import org.jeecgframework.core.util.ApplicationContextUtil;
import org.jeecgframework.core.util.MyClassLoader; import org.jeecgframework.core.util.MyClassLoader;
import org.jeecgframework.core.util.StringUtil; import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.util.UriComponentsBuilder;
import javax.validation.ConstraintViolation;
@Service("wmToUpGoodsService") @Service("wmToUpGoodsService")
@Transactional @Transactional
public class WmToUpGoodsServiceImpl extends CommonServiceImpl implements WmToUpGoodsServiceI { public class WmToUpGoodsServiceImpl extends CommonServiceImpl implements WmToUpGoodsServiceI {
@Autowired
private SystemService systemService;
@Override @Override
public void delete(WmToUpGoodsEntity entity) throws Exception{ public void delete(WmToUpGoodsEntity entity) throws Exception{

11
src/main/java/com/zzjee/wmutil/wmUtil.java
View File

@ -379,9 +379,8 @@ public class wmUtil {
+ " and ws.ku_wei_bian_ma = ? " + " and ws.ku_wei_bian_ma = ? "
+ " and ws.bin_id = ? " + " and ws.bin_id = ? "
+ " and ws.goods_id = ? " + " and ws.goods_id = ? "
+ " and ws.goods_pro_data = ? "
+ " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc";
List<Map<String, Object>> result= systemService.findForJdbc(tsql, binid,tinid,goods,prodate); List<Map<String, Object>> result= systemService.findForJdbc(tsql, binid,tinid,goods);
if(result.size() > 0) { if(result.size() > 0) {
if(Double.parseDouble(result.get(0).get("goods_qua").toString())>=Double.parseDouble(basecount)){ if(Double.parseDouble(result.get(0).get("goods_qua").toString())>=Double.parseDouble(basecount)){
flag = true; flag = true;
@ -475,10 +474,9 @@ public class wmUtil {
+ " and ws.ku_wei_bian_ma = ? " + " and ws.ku_wei_bian_ma = ? "
+ " and ws.bin_id = ? " + " and ws.bin_id = ? "
+ " and ws.goods_id = ? " + " and ws.goods_id = ? "
+ " and ws.goods_pro_data = ? " + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc";
+ " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc";
List<Map<String, Object>> result = systemService.findForJdbc(tsql, binid, tinid, goods, prodate); List<Map<String, Object>> result = systemService.findForJdbc(tsql, binid, tinid, goods);
if (result.size() > 0) { if (result.size() > 0) {
if (Double.parseDouble(result.get(0).get("goods_qua").toString()) >= Double.parseDouble(basecount)) { if (Double.parseDouble(result.get(0).get("goods_qua").toString()) >= Double.parseDouble(basecount)) {
flag = true; flag = true;
@ -567,11 +565,10 @@ e.printStackTrace();
+ " and ws.ku_wei_bian_ma = ? " + " and ws.ku_wei_bian_ma = ? "
+ " and ws.bin_id = ? " + " and ws.bin_id = ? "
+ " and ws.goods_id = ? " + " and ws.goods_id = ? "
+ " and ws.goods_pro_data = ? "
+ " and ws.cus_code = ? " + " and ws.cus_code = ? "
+ " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc";
List<Map<String, Object>> result = systemService.findForJdbc(tsql, binid, tinid, goods, prodate,cuscode); List<Map<String, Object>> result = systemService.findForJdbc(tsql, binid, tinid, goods,cuscode);
if (result.size() > 0) { if (result.size() > 0) {
if (Double.parseDouble(result.get(0).get("goods_qua").toString()) >= Double.parseDouble(basecount)) { if (Double.parseDouble(result.get(0).get("goods_qua").toString()) >= Double.parseDouble(basecount)) {
flag = true; flag = true;

4
src/main/java/com/zzjee/wv/entity/MvStockCusEntity.java
View File

@ -56,10 +56,10 @@ public class MvStockCusEntity implements java.io.Serializable {
// @Excel(name="托盘") // @Excel(name="托盘")
private java.lang.String binId; private java.lang.String binId;
/**客户*/ /**客户*/
@Excel(name="客户") @Excel(name="供应商编码")
private java.lang.String cusCode; private java.lang.String cusCode;
/**客户名称*/ /**客户名称*/
@Excel(name="客户名称") @Excel(name="供应商名称")
private java.lang.String zhongWenQch; private java.lang.String zhongWenQch;
/**商品编码*/ /**商品编码*/
@Excel(name="商品编码") @Excel(name="商品编码")

39
src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.sap.tc.logging.interfaces.IFileLog;
import org.jeecgframework.core.util.DateUtils; import org.jeecgframework.core.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -302,7 +303,7 @@ public class SmsSendTask {
wmToMoveGoodsEntity.setRunSta("库存不足"); wmToMoveGoodsEntity.setRunSta("库存不足");
systemService.saveOrUpdate(wmToMoveGoodsEntity); systemService.saveOrUpdate(wmToMoveGoodsEntity);
continue; continue;
}; }
MdBinEntity mdbin = systemService.findUniqueByProperty(MdBinEntity.class, "kuWeiBianMa", wmToMoveGoodsEntity.getBinTo()); MdBinEntity mdbin = systemService.findUniqueByProperty(MdBinEntity.class, "kuWeiBianMa", wmToMoveGoodsEntity.getBinTo());
if(mdbin==null){ if(mdbin==null){
wmToMoveGoodsEntity.setMoveSta("储位不存在"); wmToMoveGoodsEntity.setMoveSta("储位不存在");
@ -332,7 +333,7 @@ public class SmsSendTask {
} }
MvGoodsEntity mvgoods = new MvGoodsEntity(); MvGoodsEntity mvgoods = new MvGoodsEntity();
mvgoods = systemService.findUniqueByProperty( mvgoods = systemService.findUniqueByProperty(
MvGoodsEntity.class, "goodsCode", MvGoodsEntity.class, "goodsId",
wmToMoveGoodsEntity.getGoodsId()); wmToMoveGoodsEntity.getGoodsId());
wmToDownGoods.setGoodsName(mvgoods.getGoodsName()); wmToDownGoods.setGoodsName(mvgoods.getGoodsName());
if(StringUtil.isEmpty(wmToMoveGoodsEntity.getBaseGoodscount())){ if(StringUtil.isEmpty(wmToMoveGoodsEntity.getBaseGoodscount())){
@ -384,6 +385,7 @@ public class SmsSendTask {
systemService.saveOrUpdate(wmToMoveGoodsEntity); systemService.saveOrUpdate(wmToMoveGoodsEntity);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
// TODO: handle exception // TODO: handle exception
} }
this.rundowntask();//下架任务 this.rundowntask();//下架任务
@ -475,12 +477,12 @@ public class SmsSendTask {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
try { try {
mvgoods = systemService.findUniqueByProperty( mvgoods = systemService.findUniqueByProperty(
MvGoodsEntity.class, "goodsCode", MvGoodsEntity.class, "goodsId",
goods); goods);
wmOmQmIEntity.setGoodsId(mvgoods.getGoodsId()); wmOmQmIEntity.setGoodsId(mvgoods.getGoodsId());
wmOmQmIEntity.setBarCode(mvgoods.getShpTiaoMa()); wmOmQmIEntity.setBarCode(mvgoods.getShpTiaoMa());
@ -533,7 +535,7 @@ public class SmsSendTask {
resultt = systemService resultt = systemService
.findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode()); .findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
if (resultt != null && resultt.size() > 0) { if (resultt != null && resultt.size() > 0) {
String goodprodata = null; String goodprodata = null;
@ -541,7 +543,7 @@ public class SmsSendTask {
goodprodata = resultt.get(0).get("goods_pro_data").toString(); goodprodata = resultt.get(0).get("goods_pro_data").toString();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
String hiti = "0"; String hiti = "0";
try { try {
@ -664,8 +666,9 @@ public class SmsSendTask {
try { try {
double bin_qua = Double.valueOf(result.get(i) double bin_qua = Double.valueOf(result.get(i)
.get("goods_qua").toString()); .get("goods_qua").toString());
System.out.println("****************bin_qua"+bin_qua+"****************omcountwq"+omcountwq);
if (bin_qua > 0 && omcountwq > 0) { if (bin_qua > 0 && omcountwq > 0) {
if (omcountwq > bin_qua) { if (omcountwq >= bin_qua) {
wmOmQmIEntity.setBinId(result.get(i) wmOmQmIEntity.setBinId(result.get(i)
.get("ku_wei_bian_ma").toString()); .get("ku_wei_bian_ma").toString());
wmOmQmIEntity.setTinId(result.get(i) wmOmQmIEntity.setTinId(result.get(i)
@ -676,10 +679,15 @@ public class SmsSendTask {
.setBaseGoodscount(result.get(i) .setBaseGoodscount(result.get(i)
.get("goods_qua") .get("goods_qua")
.toString()); .toString());
wmOmQmIEntity.setProData(result.get(i) if (result.get(i).get("goods_pro_data") != null) {
.get("goods_pro_data").toString()); wmOmQmIEntity.setProData(result.get(i).get("goods_pro_data").toString());
wmOmQmIEntity.setCusName(result.get(i) }
.get("zhong_wen_qch").toString());
if (result.get(i)
.get("zhong_wen_qch") != null) {
wmOmQmIEntity.setCusName(result.get(i)
.get("zhong_wen_qch").toString());
}
wmOmQmIEntity.setGoodsName(result.get(i) wmOmQmIEntity.setGoodsName(result.get(i)
.get("shp_ming_cheng").toString()); .get("shp_ming_cheng").toString());
omcountwq = omcountwq - bin_qua; omcountwq = omcountwq - bin_qua;
@ -733,8 +741,12 @@ public class SmsSendTask {
.get("base_unit").toString()); .get("base_unit").toString());
wmOmQmIEntity.setBaseGoodscount(Double wmOmQmIEntity.setBaseGoodscount(Double
.toString(omcountwq)); .toString(omcountwq));
wmOmQmIEntity.setProData(result.get(i) if (result.get(i)
.get("goods_pro_data").toString()); .get("goods_pro_data") != null) {
wmOmQmIEntity.setProData(result.get(i)
.get("goods_pro_data").toString());
}
wmOmQmIEntity.setCusName(result.get(i) wmOmQmIEntity.setCusName(result.get(i)
.get("zhong_wen_qch").toString()); .get("zhong_wen_qch").toString());
wmOmQmIEntity.setGoodsName(result.get(i) wmOmQmIEntity.setGoodsName(result.get(i)
@ -789,6 +801,7 @@ public class SmsSendTask {
} }
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
} }
//catch jieshu //catch jieshu

7
src/main/resources/dbconfig.properties
View File

@ -18,10 +18,11 @@
hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.dialect=org.hibernate.dialect.MySQLDialect
validationQuery.sqlserver=SELECT 1 validationQuery.sqlserver=SELECT 1
jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8 jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8
#jdbc.url.jeecg=jdbc:mysql://120.92.53.114:3306/wms?useUnicode=true&characterEncoding=UTF-8
jdbc.username.jeecg=root jdbc.username.jeecg=Hughst
#jdbc.password.jeecg=Qwer12345 jdbc.password.jeecg=123456
jdbc.password.jeecg=zx123456 #jdbc.password.jeecg=zx123456
jdbc.dbType=mysql jdbc.dbType=mysql
#Oracle #Oracle

BIN
src/main/webapp/images/icon_sx.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

2
src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp
View File

@ -61,7 +61,7 @@ function counttiji(){
<div class="row form-wrapper"> <div class="row form-wrapper">
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b style="color:red">所属供应商</b> <b style="color:red">所属货主</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="suoShuKeHu" type="list" extendJson="{class:'form-control';datatype:'*'}" <t:dictSelect field="suoShuKeHu" type="list" extendJson="{class:'form-control';datatype:'*'}"

2
src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp
View File

@ -64,7 +64,7 @@
<div class="row form-wrapper"> <div class="row form-wrapper">
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b style="color:red">所属供应商</b> <b style="color:red">所属货主</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect readonly="readonly" field="suoShuKeHu" type="list" extendJson="{class:'form-control'}" <t:dictSelect readonly="readonly" field="suoShuKeHu" type="list" extendJson="{class:'form-control'}"

2
src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp
View File

@ -16,7 +16,7 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="操作" field="opt" width="100"></t:dgCol> <t:dgCol title="操作" field="opt" width="100"></t:dgCol>
<t:dgCol title="所属供应商" field="suoShuKeHu" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol> <t:dgCol title="所属货主" field="suoShuKeHu" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="商品名称" field="shpMingCheng" query="true" queryMode="single" width="160"></t:dgCol> <t:dgCol title="商品名称" field="shpMingCheng" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="英文名称" field="ywMingCheng" query="true" queryMode="single" width="160"></t:dgCol> <t:dgCol title="英文名称" field="ywMingCheng" query="true" queryMode="single" width="160"></t:dgCol>
<t:dgCol title="日文名称" field="rwMingCheng" query="true" queryMode="single" width="160"></t:dgCol> <t:dgCol title="日文名称" field="rwMingCheng" query="true" queryMode="single" width="160"></t:dgCol>

2
src/main/webapp/webpage/com/zzjee/wm/cuswmOmNoticeHList.jsp
View File

@ -15,7 +15,7 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol> <t:dgCol title="货主编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="要求交货时间" field="delvData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="要求交货时间" field="delvData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="收货人" field="delvMember" query="true" queryMode="single" width="60"></t:dgCol> <t:dgCol title="收货人" field="delvMember" query="true" queryMode="single" width="60"></t:dgCol>
<t:dgCol title="收货人电话" field="delvMobile" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="收货人电话" field="delvMobile" query="true" queryMode="single" width="90"></t:dgCol>

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

@ -144,6 +144,10 @@
<td colspan=4 class=xl68 width=337 style='width:252pt'>备注：${wmImNoticeHPage.imBeizhu}</td> <td colspan=4 class=xl68 width=337 style='width:252pt'>备注：${wmImNoticeHPage.imBeizhu}</td>
<td colspan=4 >进货单号：${wmImNoticeHPage.noticeId}</td> <td colspan=4 >进货单号：${wmImNoticeHPage.noticeId}</td>
</tr> </tr>
<tr height=25 style='mso-height-source:userset;height:25.0pt'>
<td colspan=8 class=xl68 width=337 style='width:252pt'>仓库：${storeName}</td>
</tr>
<tr height=33 style='mso-height-source:userset;height:25.05pt'> <tr height=33 style='mso-height-source:userset;height:25.05pt'>

162
src/main/webapp/webpage/com/zzjee/wm/print/imnoticeckd-print.jsp
View File

@ -104,17 +104,16 @@
<input id="content" type="hidden" value="${printHeader.header05}"> <input id="content" type="hidden" value="${printHeader.header05}">
<table border=0 cellpadding=0 cellspacing=0 width=680 style='border-collapse: <table border=0 cellpadding=0 cellspacing=0 width=680 style='border-collapse:
collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'> collapse;table-layout:fixed;width:438pt;margin-left: 30px;margin-top: -30px'>
<col width=45 style='mso-width-source:userset;mso-width-alt:3612;width:45pt'> <col width=100 style='mso-width-source:userset;mso-width-alt:3612;width:100pt'>
<%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%> <%--<col width=84 style='mso-width-source:userset;mso-width-alt:2986;width:63pt'>--%>
<col width=100 style='mso-width-source:userset;mso-width-alt:4010;width:100pt'> <col width=100 style='mso-width-source:userset;mso-width-alt:4010;width:80pt'>
<col width=145 style='mso-width-source:userset;mso-width-alt:1592;width:134pt'> <col width=100 style='mso-width-source:userset;mso-width-alt:1592;width:80pt'>
<col width=100 style='mso-width-source:userset;mso-width-alt:2986; <col width=100 style='mso-width-source:userset;mso-width-alt:2986;width:70pt'>
width:80pt'> <col width=77 style='mso-width-source:userset;mso-width-alt:2389;width:77pt'>
<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:70pt'>
<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:70pt'>
<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: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'>
@ -122,70 +121,81 @@
<td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td> <td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt'></td>
</tr> </tr>
<tr height=18 style='height:13.2pt'> <tr height=18 style='height:13.2pt'>
<td colspan=2 style='mso-ignore:colspan'></td>
<td colspan=7 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td> <td colspan=9 height=18 width=585 style='height:13.2pt;width:438pt;text-align: center'><span style="font-size: 18pt">${printHeader.header01}</span></td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=9 class=xl68 width=168 style='width:126pt'>${printHeader.header02}</td> <td colspan=3 class=xl68 width=168 >${printHeader.header14}</td>
<%-- <td rowspan="3" class=xl69>--%> <td colspan=3 height=40 class=168 style='height:30.0pt'>${printHeader.header15} </td>
<%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%> <td colspan=2 height=40 class=xl67 style='height:30.0pt'>${printHeader.header04} </td>
<%-- </td>--%> <td rowspan="3" class=xl69>
<img src="images/icon_sx.jpeg" style="width:80px;height:80px;vertical-align:right">
</td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl67 style='height:30.0pt'>${printHeader.header04} </td> <td colspan=3 height=40 class=xl67 style='height:30.0pt'>${printHeader.header17} </td>
<td colspan=3 class=xl68 width=168 style='width:126pt'>${printHeader.header05}</td> <td colspan=3 class=xl68 width=168 style='width:126pt'>${printHeader.header18}</td>
<td colspan=2 style='mso-ignore:colspan'></td> <td colspan=3 class=xl68 width=168 style='width:126pt'>${printHeader.header19}</td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header08}</td> <td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header06}</td>
<td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header09}</td> <td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header05}</td>
<td></td> <td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header21}</td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=4 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td> <td colspan=3 class=xl68 style='width:252pt'>${printHeader.header10}</td>
<td colspan=3 >${printHeader.header06}</td> <td colspan=3 class=xl68 style='width:252pt'>${printHeader.header20}</td>
<td></td> <td colspan=3 class=xl68 style='width:252pt'>${printHeader.header09}</td>
</tr> </tr>
<tr height=33 style='mso-height-source:userset;height:25.05pt'> <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 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>--%>
<%-- &lt;%&ndash;<td class=xl65 style='border:1.0pt solid black;text-align: center'>商品编码</td>&ndash;%&gt;--%>
<%-- <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 height=33 class=xl65 style='height:25.05pt;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 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>
</tr> </tr>
<c:if test="${fn:length(listitem) > 0 }"> <c:if test="${fn:length(listitem) > 0 }">
<c:forEach items="${listitem}" var="poVal" varStatus="stuts"> <c:forEach items="${listitem}" var="poVal" varStatus="stuts">
<tr height=33 style='mso-height-source:userset;height:50px'> <tr height=33 style='mso-height-source:userset;height:50px'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item20 }　</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item01 }　</td>
<%--<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsCode }</td>--%> <%--<td height=33 class=xl65 style='height:25.05pt;border:1.0pt solid black;text-align: center'>${poVal.goodsCode }</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.item01 }</span></td> <td class=xl65 style='border:1.0pt solid black;text-align: center;word-break:break-all;'>${poVal.item02 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item02 }</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item11}</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item03 }</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.item05 }</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item10 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item06 }</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item06 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item07 }</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item07 }</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${poVal.item08 }</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.item09 }</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'></td>
<td ></td> <td ></td>
@ -193,29 +203,65 @@
</c:forEach> </c:forEach>
<tr height=33 style='mso-height-source:userset;height:50px'> <tr height=33 style='mso-height-source:userset;height:50px'>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>合计</td> <td class=xl65 style='border:1.0pt solid black;text-align: left' colspan="5">合计：</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'></span></td> <%-- <td class=xl65 style='border:1.0pt solid black;text-align: center;word-break:break-all;' colspan="4"><span style='word-break:break-all;width: auto;font-size: 14pt'></span></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'>${printHeader.header12}</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${printHeader.header12}</td>
<td class=xl65 style='border:1.0pt solid black;text-align: center'>${printHeader.header13}</td> <td class=xl65 style='border:1.0pt solid black;text-align: center'>${printHeader.header13}</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' colspan="2"></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>--%>
</tr> </tr>
</c:if> </c:if>
<tr height=20 style='height:25.0pt'> <tr height=33 style='mso-height-source:userset;height:50px'>
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>订单员：<span <td class=xl65 style='border:1.0pt solid black;text-align: center'>收货人</td>
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <td class=xl65 style='border:1.0pt solid black;text-align: center;word-break:break-all;'>产品有无破损</td>
</span>库管：<span <td class=xl65 style='border:1.0pt solid black;text-align: center'>有 &nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 无 </td>
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>司机:<span <td class=xl65 style='border:1.0pt solid black;vertical-align:top;text-align: left' colspan="3" rowspan="2" >收货人签字:</td>
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>客户签字（盖章）<span <td class=xl65 style='border:1.0pt solid black;vertical-align:top;text-align: left' colspan="3" rowspan="2">意见栏：</td>
<td></td> </tr>
<tr height=33 style='mso-height-source:userset;height:50px'>
<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' colspan="2"></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:60px;width: 822px'>
<td class=xl65 style='border:1.0pt solid black;vertical-align:top;text-align: left;word-wrap:break-word;word-break:break-all;' colspan="9" >
重要提示：尊敬的客户，因您购买的商品为贵重易碎物品，请你认真确认送达产品的完好性以及产品的型号、颜色、数量是否与您购买时一致，配件是否齐全。验收并核对无误后请当面签字确认，若有发现破损或缺件商品，可对该商品予以拒收。客户签收后，我们对产品质量以外的问题可予以积极协助，但不作退货处理或承担相关损失。
</td>
</tr>
<tr height=15 style='height:25.0pt'>
<td height=20 class=xl66 colspan=3 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
拣货员:
</td>
<td height=20 class=xl66 colspan=3 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
复核员:
</td>
<td height=20 class=xl66 colspan=3 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
司机:
</td>
</tr>
<tr height=15 style='height:25.0pt'>
<td height=20 class=xl66 colspan="" style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
白联:存根
</td>
<td height=20 class=xl66 colspan="2" style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
红联:回执
</td>
<td height=20 class=xl66 colspan="2" style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
蓝联:
</td>
<td height=20 class=xl66 colspan=2 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
绿联:财务
</td>
<td height=20 class=xl66 colspan=2 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>
黄联:客户
</td>
</tr> </tr>
</table> </table>

10
src/main/webapp/webpage/com/zzjee/wm/print/imnoticerkd-print.jsp
View File

@ -125,14 +125,14 @@
<td colspan=6 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td> <td colspan=6 height=18 width=585 style='height:13.2pt;width:438pt'><span style="font-size: 18pt">${printHeader.header01}</span></td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=6 class=xl68 width=168 style='width:126pt'>${printHeader.header02}</td> <td colspan=6 class=xl68 width=168 style='width:126pt'></td>
<%-- <td rowspan="3" class=xl69>--%> <%-- <td rowspan="3" class=xl69>--%>
<%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%> <%-- <img src="rest/wmBaseController/showOrDownqrcodeByurl?qrvalue=${wmImNoticeHPage.noticeId}" style="width:80px;height:80px;vertical-align:right">--%>
<%-- </td>--%> <%-- </td>--%>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header04}222</td> <td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header04}</td>
<td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header05}111</td> <td colspan=3 height=40 class=xl68 style='height:30.0pt'>${printHeader.header05}</td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header08}</td> <td colspan=3 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>${printHeader.header08}</td>
@ -140,7 +140,7 @@
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt;'> <tr height=40 style='mso-height-source:userset;height:30.0pt;'>
<td colspan=3 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td> <td colspan=3 class=xl68 width=337 style='width:252pt'>${printHeader.header14}</td>
<td colspan=3 class=xl68>${printHeader.header06}</td> <td colspan=3 class=xl68>${printHeader.header16}</td>
</tr> </tr>
@ -193,7 +193,7 @@
<tr height=40 style='height:25.0pt'> <tr height=40 style='height:25.0pt'>
<td height=20 class=xl66 colspan=6 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span <td height=20 class=xl66 colspan=6 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>制单人： <span </span>制单人：${printHeader.header15} <span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>仓管签字（盖章）:<span </span>仓管签字（盖章）:<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

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

@ -181,6 +181,10 @@ function downloadqrcode() {
<td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td> <td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td>
<td colspan=1 style='mso-ignore:colspan'></td> <td colspan=1 style='mso-ignore:colspan'></td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=9 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>仓库：${storeName}</td>
<td></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=5 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td> <td colspan=5 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>客户：${wmOmNoticeHPage.delvMember}${wmOmNoticeHPage.delvMobile}</td> <td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>客户：${wmOmNoticeHPage.delvMember}${wmOmNoticeHPage.delvMobile}</td>
@ -246,12 +250,14 @@ function downloadqrcode() {
<tr height=20 style='height:25.0pt'> <tr height=20 style='height:25.0pt'>
<td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span <td height=20 class=xl66 colspan=8 style='height:15.0pt;mso-ignore:colspan;text-align: justify'>主管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>制单： ${wmOmNoticeHPage.createBy}<span </span>制单： ${wmOmNoticeHPage.createName}<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>仓管：<span </span>仓管：<span
style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</span>叉车：<span </span>叉车：<span
style='mso-spacerun:yes'></span></td> style='mso-spacerun:yes'></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
拣货员:
</td>
<td></td> <td></td>
</tr> </tr>

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

@ -181,6 +181,10 @@ function downloadqrcode() {
<td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td> <td colspan=4 class=xl68 width=168 style='width:126pt'>单号：${noticeid}</td>
<td colspan=1 style='mso-ignore:colspan'></td> <td colspan=1 style='mso-ignore:colspan'></td>
</tr> </tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=9 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>仓库：${storeName}</td>
<td ></td>
</tr>
<tr height=40 style='mso-height-source:userset;height:30.0pt'> <tr height=40 style='mso-height-source:userset;height:30.0pt'>
<td colspan=5 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td> <td colspan=5 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>货主：${cusname}</td>
<td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>客户：${ocusname}</td> <td colspan=4 height=40 class=xl68 width=242 style='height:30.0pt;width:182pt'>客户：${ocusname}</td>

18
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp
View File

@ -1,5 +1,7 @@
<%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%> <%@include file="/context/mytags.jsp"%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
@ -173,7 +175,7 @@
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>供应商：</b> <b>货主：</b>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}" <t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}"
@ -234,7 +236,7 @@
<label class="Validform_label" style="display: none">运输公司</label> <label class="Validform_label" style="display: none">运输公司</label>
</div> </div>
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>生产厂商：</b> <b>供应商：</b>
</div> </div>
<t:dictSelect field="supCode" type="list" extendJson=" {class:'form-control',style:'width:230px'}" <t:dictSelect field="supCode" type="list" extendJson=" {class:'form-control',style:'width:230px'}"
dictTable="md_sup" dictField="GYS_BIAN_MA" dictText="ZHONG_WEN_QCH" hasLabel="false" title="供应商"></t:dictSelect> dictTable="md_sup" dictField="GYS_BIAN_MA" dictText="ZHONG_WEN_QCH" hasLabel="false" title="供应商"></t:dictSelect>
@ -280,8 +282,18 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">订单类型</label> <label class="Validform_label" style="display: none">订单类型</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>仓库：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="storeCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}"
dictTable="ba_store" dictField="store_code" dictText="store_name"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">仓库</label>
<%-- <t:autocomplete searchField="cusName" name="cusCode" entityName="MvCusEntity" ></t:autocomplete> --%>
</div>
</div>
<%--<div class="col-xs-1 text-center">--%> <%--<div class="col-xs-1 text-center">--%>
<%--<b>月台：</b>--%> <%--<b>月台：</b>--%>
<%--</div>--%> <%--</div>--%>

16
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-update.jsp
View File

@ -123,13 +123,13 @@
<div class="row form-wrapper"> <div class="row form-wrapper">
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>供应商：</b> <b>货主：</b>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson="{class:'form-control',style:'width:230px'}" <t:dictSelect readonly="${wmImNoticeHPage.readonly}" field="cusCode" type="list" extendJson="{class:'form-control',style:'width:230px'}"
dictTable="mv_cus" dictField="cus_code" dictText="cus_name" defaultVal="${wmImNoticeHPage.cusCode}" hasLabel="false" title="货主"></t:dictSelect> dictTable="mv_cus" dictField="cus_code" dictText="cus_name" defaultVal="${wmImNoticeHPage.cusCode}" hasLabel="false" title="货主"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">客户编码</label> <label class="Validform_label" style="display: none">货主编码</label>
</div> </div>
@ -202,7 +202,7 @@
ignore="ignore" value='${wmImNoticeHPage.supCode}' ignore="ignore" value='${wmImNoticeHPage.supCode}'
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">生产厂商/label> <label class="Validform_label" style="display: none">供应商/label>
</div> </div>
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>预约库区：</b> <b>预约库区：</b>
@ -234,6 +234,16 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">订单类型</label> <label class="Validform_label" style="display: none">订单类型</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>仓库：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="storeCode" type="list" extendJson=" {class:'form-control',datatype:'*',style:'width:230px'}"
dictTable="ba_store" dictField="store_code" dictText="store_name" defaultVal="${wmImNoticeHPage.storeCode}"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">仓库</label>
<%-- <t:autocomplete searchField="cusName" name="cusCode" entityName="MvCusEntity" ></t:autocomplete> --%>
</div>
<%--<div class="col-xs-1 text-center">--%> <%--<div class="col-xs-1 text-center">--%>

6
src/main/webapp/webpage/com/zzjee/wm/wmImNoticeHList.jsp
View File

@ -16,14 +16,14 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="进货通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="进货通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol> <t:dgCol title="货主" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="运输号码" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol> <t:dgCol title="运输号码" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="运输公司" field="imCarDri" query="true" queryMode="single" width="50"></t:dgCol> <t:dgCol title="运输公司" field="imCarDri" query="true" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="供应商编号" field="supCode" query="true" queryMode="single" width="100"></t:dgCol> <t:dgCol title="供应商编号" field="supCode" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="生产厂商名称" field="supName" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="供应商名称" field="supName" query="true" queryMode="single" width="120"></t:dgCol>
<%--<t:dgCol title="司机电话" field="imCarMobile" query="true" queryMode="single" width="60"></t:dgCol>--%> <%--<t:dgCol title="司机电话" field="imCarMobile" query="true" queryMode="single" width="60"></t:dgCol>--%>
<t:dgCol title="订单类型" field="orderTypeCode" query="true" queryMode="single" dictionary="ba_order_type,order_type_code,order_type_name" width="60"></t:dgCol> <t:dgCol title="订单类型" field="orderTypeCode" query="true" queryMode="single" dictionary="ba_order_type,order_type_code,order_type_name" width="60"></t:dgCol>
@ -41,7 +41,7 @@
<t:dgFunOpt title="货品ID" funname="printhpid(id)" urlclass="ace_button" urlfont=" fa-print" exp="imSta#ne#已删除"/> <t:dgFunOpt title="货品ID" funname="printhpid(id)" urlclass="ace_button" urlfont=" fa-print" exp="imSta#ne#已删除"/>
<t:dgFunOpt title="完成" funname="closeor(id)" urlclass="ace_button" exp="imSta#ne#已完成"/> <t:dgFunOpt title="完成" funname="closeor(id)" urlclass="ace_button" exp="imSta#ne#已完成"/>
<t:dgFunOpt title="审核" funname="appor(id)" urlclass="ace_button" exp="imSta#eq#初始化"/> <t:dgFunOpt title="审核" funname="appor(id)" urlclass="ace_button" exp="imSta#eq#初始化"/>
<t:dgFunOpt title="回写" funname="dopost(id)" urlclass="ace_button" exp="imSta#eq#已完成"/> <%-- <t:dgFunOpt title="回写" funname="dopost(id)" urlclass="ace_button" exp="imSta#eq#已完成"/>--%>
<%-- <t:dgToolBar title="test" icon="icon-add" funname="addorder()" width="100%" height="100%"></t:dgToolBar> --%> <%-- <t:dgToolBar title="test" icon="icon-add" funname="addorder()" width="100%" height="100%"></t:dgToolBar> --%>
<t:dgToolBar title="录入" icon="icon-add" url="wmImNoticeHController.do?goAdd&orderTypeCode=01" funname="add" width="100%" height="100%"></t:dgToolBar> <t:dgToolBar title="录入" icon="icon-add" url="wmImNoticeHController.do?goAdd&orderTypeCode=01" funname="add" width="100%" height="100%"></t:dgToolBar>

2
src/main/webapp/webpage/com/zzjee/wm/wmImqtNoticeHList.jsp
View File

@ -16,7 +16,7 @@
<t:dgCol title="操作" field="opt" width="350"></t:dgCol> <t:dgCol title="操作" field="opt" width="350"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol> <t:dgCol title="货主编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol> <t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

2
src/main/webapp/webpage/com/zzjee/wm/wmImtNoticeHList.jsp
View File

@ -16,7 +16,7 @@
<t:dgCol title="操作" field="opt" width="350"></t:dgCol> <t:dgCol title="操作" field="opt" width="350"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol> <t:dgCol title="货主编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol> <t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

2
src/main/webapp/webpage/com/zzjee/wm/wmImykNoticeHList.jsp
View File

@ -14,7 +14,7 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="通知单号" field="noticeId" query="true" sortable="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol> <t:dgCol title="货主编码" field="cusCode" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="200"></t:dgCol>
<t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="预计到货时间" field="imData" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="90"></t:dgCol>
<t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol> <t:dgCol title="车号" field="imCarNo" query="true" queryMode="single" width="50"></t:dgCol>

26
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp
View File

@ -144,13 +144,13 @@
<div class="row form-wrapper"> <div class="row form-wrapper">
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>供应商：</b> <b>货主：</b>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}" <t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}"
defaultVal="${wmOmNoticeHPage.cusCode}" readonly="${wmOmNoticeHPage.readonly}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="客户编码"></t:dictSelect> defaultVal="${wmOmNoticeHPage.cusCode}" readonly="${wmOmNoticeHPage.readonly}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="货主编码"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">客户编码</label> <label class="Validform_label" style="display: none">货主编码</label>
</div> </div>
@ -295,6 +295,17 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">发货运单号或车号</label> <label class="Validform_label" style="display: none">发货运单号或车号</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>送货方式：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="delvMethod" type="list" extendJson="{class:'form-control',style:'width:150px'}"
typeGroupCode="dev_method" defaultVal="${wmOmNoticeHPage.delvMethod}" title="订单类型"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">送货方式</label>
</div>
</div> </div>
@ -319,6 +330,15 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">备注</label> <label class="Validform_label" style="display: none">备注</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>仓库：</b>
</div>
<div class="col-xs-2">
<t:dictSelect id="storeCode" field="storeCode" type="list" extendJson="{class:'form-control',style:'width:230px'}"
dictTable="ba_store" dictField="store_code" dictText="store_name" hasLabel="false" title="仓库"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">仓库</label>
</div>
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>附件 </b> <b>附件 </b>

29
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-update.jsp
View File

@ -119,14 +119,14 @@
<div class="row form-wrapper"> <div class="row form-wrapper">
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>供应商：</b> <b>货主：</b>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}" <t:dictSelect field="cusCode" type="list" extendJson="{class:'form-control',datatype:'*',style:'width:230px'}"
readonly="${wmOmNoticeHPage.readonly}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" defaultVal='${wmOmNoticeHPage.cusCode}' hasLabel="false" title="客户编码"></t:dictSelect> readonly="${wmOmNoticeHPage.readonly}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" defaultVal='${wmOmNoticeHPage.cusCode}' hasLabel="false" title="货主编码"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">客户</label> <label class="Validform_label" style="display: none">货主</label>
</div> </div>
@ -263,6 +263,19 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">发货运单号或车号</label> <label class="Validform_label" style="display: none">发货运单号或车号</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>送货方式：</b>
</div>
<div class="col-xs-2">
<t:dictSelect field="delvMethod" type="list" extendJson="{class:'form-control',style:'width:150px'}"
typeGroupCode="dev_method" defaultVal="${wmOmNoticeHPage.delvMethod}" hasLabel="false" title="订单类型"></t:dictSelect>
<%-- <input id="reCarno" name="reCarno" type="text" class="form-control"--%>
<%-- />--%>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">送货方式</label>
</div>
</div> </div>
@ -303,7 +316,15 @@
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">状态</label> <label class="Validform_label" style="display: none">状态</label>
</div> </div>
<div class="col-xs-1 text-center">
<b>仓库：</b>
</div>
<div class="col-xs-2">
<t:dictSelect id="storeCode" field="storeCode" type="list" extendJson="{class:'form-control',style:'width:230px'}" defaultVal="${wmOmNoticeHPage.storeCode}"
dictTable="ba_store" dictField="store_code" dictText="store_name" hasLabel="false" title="仓库"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">仓库</label>
</div>
<div class="col-xs-1 text-center"> <div class="col-xs-1 text-center">
<b>附件</b> <b>附件</b>

2
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
View File

@ -19,7 +19,7 @@
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="出货单号" field="omNoticeId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="供应商编码" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol> <t:dgCol title="货主编码" field="cusCode" query="true" queryMode="single" dictionary="mv_cus,cus_code,cus_name" width="120"></t:dgCol>
<t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="100"></t:dgCol> <t:dgCol title="客户订单号" field="imCusCode" query="true" queryMode="single" width="100"></t:dgCol>
<t:dgCol title="备注" field="omBeizhu" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="备注" field="omBeizhu" query="true" queryMode="single" width="120"></t:dgCol>

4
src/main/webapp/webpage/com/zzjee/wm/wmSttInGoodsList.jsp
View File

@ -17,8 +17,8 @@
<t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol> <t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="客户名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol> <t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="group" width="80"></t:dgCol> <t:dgCol title="创建人名称" field="createName" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="group" width="120"></t:dgCol>

4
src/main/webapp/webpage/com/zzjee/wm/wmSttInGoodscygzList.jsp
View File

@ -17,8 +17,8 @@
<t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol> <t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="客户名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol> <t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" queryMode="group" width="80"></t:dgCol> <t:dgCol title="创建人名称" field="createName" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="group" width="120"></t:dgCol> <t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="group" width="120"></t:dgCol>

4
src/main/webapp/webpage/com/zzjee/wm/wmSttInGoodsfpList.jsp
View File

@ -23,8 +23,8 @@
<t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="批次" field="goodsBatch" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol> <t:dgCol title="盘点数量" field="sttQua" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="客户名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主名称" field="cusName" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="客户" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="货主" field="cusCode" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol> <t:dgCol title="盘点状态" field="sttSta" query="true" width="120"></t:dgCol>
<t:dgFunOpt title="复盘" funname="dosttfp(id)" urlclass="ace_button" exp="sttSta#eq#已完成" /> <t:dgFunOpt title="复盘" funname="dosttfp(id)" urlclass="ace_button" exp="sttSta#eq#已完成" />

4
src/main/webapp/webpage/com/zzjee/wv/mvStockCusList.jsp
View File

@ -17,8 +17,8 @@
<t:dgCol title="库存单位" field="baseUnit" queryMode="group" width="90"></t:dgCol> <t:dgCol title="库存单位" field="baseUnit" queryMode="group" width="90"></t:dgCol>
<%-- <t:dgCol title="储位编码" field="kuWeiBianMa" query="true" queryMode="single" width="90"></t:dgCol> --%> <%-- <t:dgCol title="储位编码" field="kuWeiBianMa" query="true" queryMode="single" width="90"></t:dgCol> --%>
<%-- <t:dgCol title="托盘" field="binId" query="true" queryMode="single" width="70"></t:dgCol> --%> <%-- <t:dgCol title="托盘" field="binId" query="true" queryMode="single" width="70"></t:dgCol> --%>
<t:dgCol title="客户" field="cusCode" query="true" queryMode="single" width="80"></t:dgCol> <t:dgCol title="供应商编码" field="cusCode" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="客户名称" field="zhongWenQch" queryMode="group" width="120"></t:dgCol> <t:dgCol title="供应商名称" field="zhongWenQch" queryMode="group" width="120"></t:dgCol>
<%-- <t:dgCol title="单位" field="shlDanWei" queryMode="group" width="120"></t:dgCol> --%> <%-- <t:dgCol title="单位" field="shlDanWei" queryMode="group" width="120"></t:dgCol> --%>
<t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="90"></t:dgCol> <t:dgCol title="生产日期" field="goodsProData" formatter="yyyy-MM-dd" query="true" queryMode="single" width="90"></t:dgCol>