From 6447194fa338ff26be052a227a8c6cb1a989dd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 10 Oct 2017 23:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=20=E5=88=B6=E9=80=A0=E5=95=86=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/action/materials/DepotItemAction.java | 5 +-- .../jsh/action/materials/MaterialAction.java | 13 ++++---- .../com/jsh/dao/materials/DepotHeadDAO.java | 4 +-- .../service/materials/MaterialService.java | 16 +++++----- .../java/com/jsh/util/MaterialConstants.java | 4 +-- src/main/webapp/js/pages/materials/in_out.js | 8 ++--- .../pages/materials/allocation_out_list.jsp | 2 +- .../webapp/pages/materials/assemble_list.jsp | 2 +- .../pages/materials/disassemble_list.jsp | 2 +- .../webapp/pages/materials/gift_out_list.jsp | 2 +- .../pages/materials/gift_recharge_list.jsp | 2 +- src/main/webapp/pages/materials/material.jsp | 32 +++++++++---------- .../webapp/pages/materials/other_in_list.jsp | 2 +- .../webapp/pages/materials/other_out_list.jsp | 2 +- .../pages/materials/purchase_back_list.jsp | 2 +- .../pages/materials/purchase_in_list.jsp | 2 +- .../pages/materials/retail_back_list.jsp | 2 +- .../pages/materials/retail_out_list.jsp | 2 +- .../webapp/pages/materials/sale_back_list.jsp | 2 +- .../webapp/pages/materials/sale_out_list.jsp | 2 +- 20 files changed, 55 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/jsh/action/materials/DepotItemAction.java b/src/main/java/com/jsh/action/materials/DepotItemAction.java index 935c27e4..bc061494 100644 --- a/src/main/java/com/jsh/action/materials/DepotItemAction.java +++ b/src/main/java/com/jsh/action/materials/DepotItemAction.java @@ -280,9 +280,10 @@ public class DepotItemAction extends BaseAction ratio = depotItem.getMaterialId().getUnitId().getUName(); ratio = ratio.substring(ratio.indexOf("(")); } - //品名/型号/制造商/包装 + //品名/型号/规格/颜色/包装 String MaterialName = depotItem.getMaterialId().getName() + ((depotItem.getMaterialId().getModel() == null||depotItem.getMaterialId().getModel().equals(""))?"":"("+depotItem.getMaterialId().getModel()+ ")") - +((depotItem.getMaterialId().getMfrs() == null||depotItem.getMaterialId().getMfrs().equals(""))?"":"("+depotItem.getMaterialId().getMfrs() + ")") + +((depotItem.getMaterialId().getStandard() == null||depotItem.getMaterialId().getStandard().equals(""))?"":"("+depotItem.getMaterialId().getStandard() + ")") + +((depotItem.getMaterialId().getColor() == null||depotItem.getMaterialId().getColor().equals(""))?"":"("+depotItem.getMaterialId().getColor() + ")") + ratio; item.put("MaterialName", MaterialName); item.put("Unit", depotItem.getMUnit()); diff --git a/src/main/java/com/jsh/action/materials/MaterialAction.java b/src/main/java/com/jsh/action/materials/MaterialAction.java index dff7510e..e005cb81 100644 --- a/src/main/java/com/jsh/action/materials/MaterialAction.java +++ b/src/main/java/com/jsh/action/materials/MaterialAction.java @@ -374,7 +374,7 @@ public class MaterialAction extends BaseAction item.put("SafetyStock", material.getSafetyStock()==null?"" : material.getSafetyStock()); item.put("Model", material.getModel()); item.put("Standard", material.getStandard()); - item.put("Color", material.getColor()); + item.put("Color", material.getColor()==null?"": material.getColor()); item.put("Unit", material.getUnit()); item.put("RetailPrice", material.getRetailPrice()); item.put("LowPrice", material.getLowPrice()); @@ -430,9 +430,10 @@ public class MaterialAction extends BaseAction ratio = material.getUnitId().getUName(); ratio = ratio.substring(ratio.indexOf("(")); } - //品名/型号/制造商/包装 + //品名/型号/规格/颜色/包装 String MaterialName = material.getName() + ((material.getModel() == null || material.getModel().equals(""))?"":"("+material.getModel() + ")") - + ((material.getMfrs() == null || material.getMfrs().equals(""))?"":"("+material.getMfrs() + ")") + + ((material.getStandard() == null || material.getStandard().equals(""))?"":"("+material.getStandard() + ")") + + ((material.getColor() == null || material.getColor().equals(""))?"":"("+material.getColor() + ")") + ratio; item.put("MaterialName", MaterialName); dataArray.add(item); @@ -563,7 +564,7 @@ public class MaterialAction extends BaseAction Map condition = new HashMap(); condition.put("Name_s_like", model.getName()); condition.put("Model_s_like", model.getModel()); - condition.put("Mfrs_s_like", model.getMfrs()); + condition.put("Color_s_like", model.getColor()); condition.put("Id_s_order", "asc"); return condition; } @@ -579,7 +580,7 @@ public class MaterialAction extends BaseAction Map condition = new HashMap(); condition.put("Name_s_like", model.getName()); condition.put("Model_s_like", model.getModel()); - condition.put("Mfrs_s_like", model.getMfrs()); + condition.put("Color_s_like", model.getColor()); condition.put("CategoryId_s_in", model.getCategoryIds()); condition.put("Id_s_order", "asc"); return condition; @@ -592,7 +593,7 @@ public class MaterialAction extends BaseAction } condition.put("Name_s_eq", model.getName()); condition.put("Model_s_eq", model.getModel()); - condition.put("Mfrs_s_eq", model.getMfrs()); + condition.put("Color_s_eq", model.getColor()); if(model.getUnit()!=null){ condition.put("Unit_s_eq", model.getUnit()); } diff --git a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java index b09a287d..e4ca6588 100644 --- a/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java +++ b/src/main/java/com/jsh/dao/materials/DepotHeadDAO.java @@ -122,7 +122,7 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { @SuppressWarnings("unchecked") public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException { StringBuffer queryString = new StringBuffer(); - queryString.append("select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model,' ',jsh_material.Mfrs)) as mName from jsh_depotitem inner join jsh_material " + + queryString.append("select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model,' ',jsh_material.Color)) as mName from jsh_depotitem inner join jsh_material " + " on jsh_depotitem.MaterialId = jsh_material.Id where jsh_depotitem.HeaderId ="+ headerId); Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); pageUtil.setPageList(query.list()); @@ -164,7 +164,7 @@ public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO { public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam) throws JshException { StringBuffer queryString = new StringBuffer(); queryString.append("select group_concat(CAST(dt.HeaderId AS CHAR)) as ids from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where m.`Name` "+ - " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%' or m.Mfrs like '%" + materialParam + "%'"); + " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%' or m.Color like '%" + materialParam + "%'"); Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); pageUtil.setPageList(query.list()); } diff --git a/src/main/java/com/jsh/service/materials/MaterialService.java b/src/main/java/com/jsh/service/materials/MaterialService.java index 485861bb..0801e853 100644 --- a/src/main/java/com/jsh/service/materials/MaterialService.java +++ b/src/main/java/com/jsh/service/materials/MaterialService.java @@ -89,7 +89,7 @@ public class MaterialService extends BaseService implements MaterialIS workbook = Workbook.createWorkbook(os); WritableSheet sheet = workbook.createSheet("信息报表", 0); //增加列头 - String[] colunmName = {"品名","类型","型号","制造商","规格","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态"}; + String[] colunmName = {"品名","类型","型号","颜色","规格","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态"}; for(int i = 0 ;i < colunmName.length;i ++) { sheet.setColumnView(i, 10); sheet.addCell(new Label(i, 0, colunmName[i])); @@ -102,7 +102,7 @@ public class MaterialService extends BaseService implements MaterialIS sheet.addCell(new Label(j++,i, material.getName())); sheet.addCell(new Label(j++,i, material.getMaterialCategory().getName())); sheet.addCell(new Label(j++,i, material.getModel() == null ?"": material.getModel())); - sheet.addCell(new Label(j++,i, material.getMfrs() == null ?"": material.getMfrs())); + sheet.addCell(new Label(j++,i, material.getColor() == null ?"": material.getColor())); sheet.addCell(new Label(j++,i, material.getStandard() == null ?"": material.getStandard())); sheet.addCell(getLabelInfo(cellInfo,j++,i, material.getSafetyStock() == null ?"": material.getSafetyStock().toString(),material)); sheet.addCell(new Label(j++,i, material.getUnit() == null ?"": material.getUnit())); @@ -242,7 +242,7 @@ public class MaterialService extends BaseService implements MaterialIS Log.infoFileSync("==================excel表格中第" + totalRow + "行的第 " + cellIndex + "列的值为" + cell.getStringCellValue()); - //每行中数据顺序 "品名","类型","型号","制造商","规格","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态" + //每行中数据顺序 "品名","类型","型号","颜色","规格","安全存量","单位","零售价","最低售价","预计采购价","批发价","备注","状态" switch(cellIndex) { case MaterialConstants.BusinessForExcel.EXCEL_NAME : String materialName = cell.getStringCellValue(); @@ -268,13 +268,13 @@ public class MaterialService extends BaseService implements MaterialIS } material.setModel(model); break; - case MaterialConstants.BusinessForExcel.EXCEL_MFRS : - String mfrs = cell.getStringCellValue(); - if(null == mfrs || "".equals(mfrs)) { - Log.errorFileSync(">>>>>>>>>>>>>>>>列表没有填写(制造商)信息"); + case MaterialConstants.BusinessForExcel.EXCEL_COLOR : + String color = cell.getStringCellValue(); + if(null == color || "".equals(color)) { + Log.errorFileSync(">>>>>>>>>>>>>>>>列表没有填写(颜色)信息"); break; } - material.setMfrs(mfrs); + material.setColor(color); break; case MaterialConstants.BusinessForExcel.EXCEL_STANDARD : String standard = cell.getStringCellValue(); diff --git a/src/main/java/com/jsh/util/MaterialConstants.java b/src/main/java/com/jsh/util/MaterialConstants.java index 1bd26e87..68a6bdf1 100644 --- a/src/main/java/com/jsh/util/MaterialConstants.java +++ b/src/main/java/com/jsh/util/MaterialConstants.java @@ -32,9 +32,9 @@ public interface MaterialConstants public static final int EXCEL_CATEGORY = 1; /** - * 制造商 + * 颜色 */ - public static final int EXCEL_MFRS = 2; + public static final int EXCEL_COLOR = 2; /** * 型号 diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js index 2bdb8270..210e165f 100644 --- a/src/main/webapp/js/pages/materials/in_out.js +++ b/src/main/webapp/js/pages/materials/in_out.js @@ -788,7 +788,7 @@ } } }, - { title: '品名(型号)(制造商)(包装)',field: 'MaterialId',width:230, + { title: '品名(型号)(规格)(颜色)(包装)',field: 'MaterialId',width:230, formatter:function(value,row,index){ return row.MaterialName; }, @@ -1039,7 +1039,7 @@ { title: '备注',field: 'Remark',editor:'validatebox',width:150}, { title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60}, { title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60}, - { title: '制造商-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60}, + { title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60}, { title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60}, { title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60} ]], @@ -1150,7 +1150,7 @@ columns:[[ { title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn}, { title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90}, - { title: '品名(型号)(制造商)(包装)',field: 'MaterialName',width:230}, + { title: '品名(型号)(规格)(颜色)(包装)',field: 'MaterialName',width:230}, { title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90}, { title: '单位',field: 'Unit',editor:'validatebox',width:70}, { title: '数量',field: 'OperNumber',editor:'validatebox',width:70}, @@ -1163,7 +1163,7 @@ { title: '备注',field: 'Remark',editor:'validatebox',width:150}, { title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60}, { title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60}, - { title: '制造商-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60}, + { title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60}, { title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60}, { title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60} ]], diff --git a/src/main/webapp/pages/materials/allocation_out_list.jsp b/src/main/webapp/pages/materials/allocation_out_list.jsp index 1d06358f..6f8e1c1d 100644 --- a/src/main/webapp/pages/materials/allocation_out_list.jsp +++ b/src/main/webapp/pages/materials/allocation_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/assemble_list.jsp b/src/main/webapp/pages/materials/assemble_list.jsp index 7b5b671f..d6a91e70 100644 --- a/src/main/webapp/pages/materials/assemble_list.jsp +++ b/src/main/webapp/pages/materials/assemble_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/disassemble_list.jsp b/src/main/webapp/pages/materials/disassemble_list.jsp index 14da5f30..13f77a65 100644 --- a/src/main/webapp/pages/materials/disassemble_list.jsp +++ b/src/main/webapp/pages/materials/disassemble_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_out_list.jsp b/src/main/webapp/pages/materials/gift_out_list.jsp index 537ff17d..f403257b 100644 --- a/src/main/webapp/pages/materials/gift_out_list.jsp +++ b/src/main/webapp/pages/materials/gift_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/gift_recharge_list.jsp b/src/main/webapp/pages/materials/gift_recharge_list.jsp index 961c8f6d..cb7c05a4 100644 --- a/src/main/webapp/pages/materials/gift_recharge_list.jsp +++ b/src/main/webapp/pages/materials/gift_recharge_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/material.jsp b/src/main/webapp/pages/materials/material.jsp index 2c2203e9..5abeb983 100644 --- a/src/main/webapp/pages/materials/material.jsp +++ b/src/main/webapp/pages/materials/material.jsp @@ -35,9 +35,9 @@ - 制造商： + 颜色： - + 类别： @@ -86,9 +86,9 @@ - 制造商 + 颜色 - + 规格 @@ -503,7 +503,7 @@ var str = ''; var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark + 'AaBb' + rec.Standard - + 'AaBb' + rec.Mfrs + 'AaBb' + rec.Packing + 'AaBb' + rec.SafetyStock + 'AaBb' + rec.CategoryId + 'AaBb' + rec.CategoryName + + 'AaBb' + rec.Color + 'AaBb' + rec.Packing + 'AaBb' + rec.SafetyStock + 'AaBb' + rec.CategoryId + 'AaBb' + rec.CategoryName + 'AaBb' + rec.UnitId + 'AaBb' + rec.UnitName + 'AaBb' + rec.FirstOutUnit + 'AaBb' + rec.FirstInUnit; if(1 == value) { @@ -515,7 +515,7 @@ }, { title: '品名',field: 'Name',width:80}, { title: '型号',field: 'Model',width:80}, - { title: '制造商',field: 'Mfrs',width:150}, + { title: '颜色',field: 'Color',width:80}, { title: '规格',field: 'Standard',width:80}, { title: '单位',field: 'Unit',width:60}, { title: '安全存量',field: 'SafetyStock',width:90}, @@ -872,10 +872,10 @@ //增加 var url; var materialID = 0; - //保存编辑前的名称/型号/制造商 + //保存编辑前的名称/型号/颜色 var oldName = ""; var oldModel = ""; - var oldMfrs = ""; + var oldColor = ""; var oldUnit = ""; var oldManyUnit = ""; @@ -901,7 +901,7 @@ $(".price-two").show(); oldName = ""; oldModel = ""; - oldMfrs = ""; + oldColor = ""; oldUnit = ""; oldManyUnit = ""; materialID = 0; @@ -912,13 +912,13 @@ function checkIsExist() { var mName = $.trim($("#Name").val()); var mModel = $.trim($("#Model").val()); - var mMfrs = $.trim($("#Mfrs").val()); + var mColor = $.trim($("#Color").val()); var mUnit = $.trim($("#Unit").val()); var mUnitId = $.trim($("#manyUnit").val()); //表示是否存在 true == 存在 false = 不存在 var flag = false; //开始ajax名称检验，不能重名(新增或编辑) - if(materialID==0 || (materialID!=0 && (mName != oldName || mModel != oldModel || mMfrs != oldMfrs || mUnit != oldUnit || mUnitId != oldManyUnit))) { + if(materialID==0 || (materialID!=0 && (mName != oldName || mModel != oldModel || mColor != oldColor || mUnit != oldUnit || mUnitId != oldManyUnit))) { $.ajax({ type:"post", url: "<%=path%>/material/checkIsExist.action", @@ -928,7 +928,7 @@ MaterialID : materialID, Name : mName, Model: mModel, - Mfrs: mMfrs, + Color: mColor, Unit: mUnit, UnitId: mUnitId }), @@ -1001,7 +1001,7 @@ data: ({ CategoryId : parent, Name : $.trim($("#Name").val()), - Mfrs : $.trim($("#Mfrs").val()), + Color : $.trim($("#Color").val()), Packing : $.trim($("#Packing").val()), SafetyStock : $.trim($("#SafetyStock").val()), Model : $.trim($("#Model").val()), @@ -1075,7 +1075,7 @@ $("#clientIp").val('<%=clientIp %>'); $("#Name").focus().val(materialInfo[1]); - $("#Mfrs").focus().val(materialInfo[11]); + $("#Color").focus().val(materialInfo[11]); var categoryName = ""; //类型名称 mId = materialInfo[14]; @@ -1191,7 +1191,7 @@ oldName = materialInfo[1]; oldModel = materialInfo[2]; - oldMfrs = materialInfo[11]; + oldColor = materialInfo[11]; oldUnit = materialInfo[4]; oldManyUnit = materialInfo[16]; $('#materialDlg').dialog('open').dialog('setTitle',' 编辑商品信息'); @@ -1240,7 +1240,7 @@ data: ({ Name: $.trim($("#searchName").val()), Model: $.trim($("#searchModel").val()), - Mfrs: $.trim($("#searchMfrs").val()), + Color: $.trim($("#searchColor").val()), CategoryId:cid, CategoryIds:setCategoryId, pageNo:pageNo, diff --git a/src/main/webapp/pages/materials/other_in_list.jsp b/src/main/webapp/pages/materials/other_in_list.jsp index b8885a88..b03e4aac 100644 --- a/src/main/webapp/pages/materials/other_in_list.jsp +++ b/src/main/webapp/pages/materials/other_in_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/other_out_list.jsp b/src/main/webapp/pages/materials/other_out_list.jsp index d134ecda..6e38c6b4 100644 --- a/src/main/webapp/pages/materials/other_out_list.jsp +++ b/src/main/webapp/pages/materials/other_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_back_list.jsp b/src/main/webapp/pages/materials/purchase_back_list.jsp index 288d1dad..bd7b2586 100644 --- a/src/main/webapp/pages/materials/purchase_back_list.jsp +++ b/src/main/webapp/pages/materials/purchase_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/purchase_in_list.jsp b/src/main/webapp/pages/materials/purchase_in_list.jsp index db7bacf8..0b66495c 100644 --- a/src/main/webapp/pages/materials/purchase_in_list.jsp +++ b/src/main/webapp/pages/materials/purchase_in_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_back_list.jsp b/src/main/webapp/pages/materials/retail_back_list.jsp index ba80d698..7410e010 100644 --- a/src/main/webapp/pages/materials/retail_back_list.jsp +++ b/src/main/webapp/pages/materials/retail_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/retail_out_list.jsp b/src/main/webapp/pages/materials/retail_out_list.jsp index 0c2fdaf7..7c511c50 100644 --- a/src/main/webapp/pages/materials/retail_out_list.jsp +++ b/src/main/webapp/pages/materials/retail_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_back_list.jsp b/src/main/webapp/pages/materials/sale_back_list.jsp index 13a9235b..6e75e058 100644 --- a/src/main/webapp/pages/materials/sale_back_list.jsp +++ b/src/main/webapp/pages/materials/sale_back_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期： diff --git a/src/main/webapp/pages/materials/sale_out_list.jsp b/src/main/webapp/pages/materials/sale_out_list.jsp index 3869b31c..6d5f75fa 100644 --- a/src/main/webapp/pages/materials/sale_out_list.jsp +++ b/src/main/webapp/pages/materials/sale_out_list.jsp @@ -39,7 +39,7 @@ 商品信息： - + 单据日期：