diff --git a/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java b/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java index be8745d6..28f70dc6 100644 --- a/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java +++ b/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java @@ -76,13 +76,13 @@ import io.swagger.annotations.ApiParam; /** * @Title: Controller - * @Description: 物资 + * @Description: 物料 * @author onlineGenerator * @date 2018-05-20 21:40:03 * @version V1.0 * */ -@Api(value="TWzMaterial",description="物资",tags="tWzMaterialController") +@Api(value="TWzMaterial",description="物料",tags="tWzMaterialController") @Controller @RequestMapping("/tWzMaterialController") public class TWzMaterialController extends BaseController { @@ -101,7 +101,7 @@ public class TWzMaterialController extends BaseController { /** - * 物资列表 页面跳转 + * 物料列表 页面跳转 * * @return */ @@ -135,7 +135,7 @@ public class TWzMaterialController extends BaseController { } /** - * 删除物资 + * 删除物料 * * @return */ @@ -145,13 +145,13 @@ public class TWzMaterialController extends BaseController { String message = null; AjaxJson j = new AjaxJson(); tWzMaterial = systemService.getEntity(TWzMaterialEntity.class, tWzMaterial.getId()); - message = "物资删除成功"; + message = "物料删除成功"; try{ tWzMaterialService.delete(tWzMaterial); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资删除失败"; + message = "物料删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -159,7 +159,7 @@ public class TWzMaterialController extends BaseController { } /** - * 批量删除物资 + * 批量删除物料 * * @return */ @@ -168,7 +168,7 @@ public class TWzMaterialController extends BaseController { public AjaxJson doBatchDel(String ids,HttpServletRequest request){ String message = null; AjaxJson j = new AjaxJson(); - message = "物资删除成功"; + message = "物料删除成功"; try{ for(String id:ids.split(",")){ TWzMaterialEntity tWzMaterial = systemService.getEntity(TWzMaterialEntity.class, @@ -179,7 +179,7 @@ public class TWzMaterialController extends BaseController { } }catch(Exception e){ e.printStackTrace(); - message = "物资删除失败"; + message = "物料删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -188,7 +188,7 @@ public class TWzMaterialController extends BaseController { /** - * 添加物资 + * 添加物料 * * @return */ @@ -197,13 +197,13 @@ public class TWzMaterialController extends BaseController { public AjaxJson doAdd(TWzMaterialEntity tWzMaterial, HttpServletRequest request) { String message = null; AjaxJson j = new AjaxJson(); - message = "物资添加成功"; + message = "物料添加成功"; try{ tWzMaterialService.save(tWzMaterial); systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资添加失败"; + message = "物料添加失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -211,7 +211,7 @@ public class TWzMaterialController extends BaseController { } /** - * 更新物资 + * 更新物料 * * @return */ @@ -220,7 +220,7 @@ public class TWzMaterialController extends BaseController { public AjaxJson doUpdate(TWzMaterialEntity tWzMaterial, HttpServletRequest request) { String message = null; AjaxJson j = new AjaxJson(); - message = "物资更新成功"; + message = "物料更新成功"; TWzMaterialEntity t = tWzMaterialService.get(TWzMaterialEntity.class, tWzMaterial.getId()); try { MyBeanUtils.copyBeanNotNull2Bean(tWzMaterial, t); @@ -228,7 +228,7 @@ public class TWzMaterialController extends BaseController { systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); } catch (Exception e) { e.printStackTrace(); - message = "物资更新失败"; + message = "物料更新失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -237,7 +237,7 @@ public class TWzMaterialController extends BaseController { /** - * 物资新增页面跳转 + * 物料新增页面跳转 * * @return */ @@ -250,7 +250,7 @@ public class TWzMaterialController extends BaseController { return new ModelAndView("com/zzjee/wz/tWzMaterial-add"); } /** - * 物资编辑页面跳转 + * 物料编辑页面跳转 * * @return */ @@ -286,9 +286,9 @@ public class TWzMaterialController extends BaseController { CriteriaQuery cq = new CriteriaQuery(TWzMaterialEntity.class, dataGrid); org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzMaterial, request.getParameterMap()); List tWzMaterials = this.tWzMaterialService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"物资"); + modelMap.put(NormalExcelConstants.FILE_NAME,"物料"); modelMap.put(NormalExcelConstants.CLASS,TWzMaterialEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物资列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物料列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), "导出信息")); modelMap.put(NormalExcelConstants.DATA_LIST,tWzMaterials); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -302,9 +302,9 @@ public class TWzMaterialController extends BaseController { @RequestMapping(params = "exportXlsByT") public String exportXlsByT(TWzMaterialEntity tWzMaterial,HttpServletRequest request,HttpServletResponse response , DataGrid dataGrid,ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"物资"); + modelMap.put(NormalExcelConstants.FILE_NAME,"物料"); modelMap.put(NormalExcelConstants.CLASS,TWzMaterialEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物资列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物料列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), "导出信息")); modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -353,7 +353,7 @@ public class TWzMaterialController extends BaseController { @RequestMapping(method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="物资列表信息",produces="application/json",httpMethod="GET") + @ApiOperation(value="物料列表信息",produces="application/json",httpMethod="GET") public ResponseMessage> list() { List listTWzMaterials=tWzMaterialService.getList(TWzMaterialEntity.class); return Result.success(listTWzMaterials); @@ -361,19 +361,19 @@ public class TWzMaterialController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="根据ID获取物资信息",notes="根据ID获取物资信息",httpMethod="GET",produces="application/json") + @ApiOperation(value="根据ID获取物料信息",notes="根据ID获取物料信息",httpMethod="GET",produces="application/json") public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { TWzMaterialEntity task = tWzMaterialService.get(TWzMaterialEntity.class, id); if (task == null) { - return Result.error("根据ID获取物资信息为空"); + return Result.error("根据ID获取物料信息为空"); } return Result.success(task); } @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="创建物资") - public ResponseMessage create(@ApiParam(name="物资对象")@RequestBody TWzMaterialEntity tWzMaterial, UriComponentsBuilder uriBuilder) { + @ApiOperation(value="创建物料") + public ResponseMessage create(@ApiParam(name="物料对象")@RequestBody TWzMaterialEntity tWzMaterial, UriComponentsBuilder uriBuilder) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzMaterial); if (!failures.isEmpty()) { @@ -385,15 +385,15 @@ public class TWzMaterialController extends BaseController { tWzMaterialService.save(tWzMaterial); } catch (Exception e) { e.printStackTrace(); - return Result.error("物资信息保存失败"); + return Result.error("物料信息保存失败"); } return Result.success(tWzMaterial); } @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="更新物资",notes="更新物资") - public ResponseMessage update(@ApiParam(name="物资对象")@RequestBody TWzMaterialEntity tWzMaterial) { + @ApiOperation(value="更新物料",notes="更新物料") + public ResponseMessage update(@ApiParam(name="物料对象")@RequestBody TWzMaterialEntity tWzMaterial) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzMaterial); if (!failures.isEmpty()) { @@ -405,16 +405,16 @@ public class TWzMaterialController extends BaseController { tWzMaterialService.saveOrUpdate(tWzMaterial); } catch (Exception e) { e.printStackTrace(); - return Result.error("更新物资信息失败"); + return Result.error("更新物料信息失败"); } //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success("更新物资信息成功"); + return Result.success("更新物料信息成功"); } @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除物资") + @ApiOperation(value="删除物料") public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { logger.info("delete[{}]" + id); // 验证 @@ -425,7 +425,7 @@ public class TWzMaterialController extends BaseController { tWzMaterialService.deleteEntityById(TWzMaterialEntity.class, id); } catch (Exception e) { e.printStackTrace(); - return Result.error("物资删除失败"); + return Result.error("物料删除失败"); } return Result.success(); diff --git a/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java b/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java index ea5f5df0..8f0a3683 100644 --- a/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java +++ b/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java @@ -20,7 +20,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; /** * @Title: Entity - * @Description: 物资 + * @Description: 物料 * @author onlineGenerator * @date 2018-05-20 21:40:03 * @version V1.0 @@ -50,11 +50,11 @@ public class TWzMaterialEntity implements java.io.Serializable { private String sysCompanyCode; /**流程状态*/ private String bpmStatus; - /**物资编码*/ - @Excel(name="物资编码",width=15) + /**物料编码*/ + @Excel(name="物料编码",width=15) private String matCode; - /**物资名称*/ - @Excel(name="物资名称",width=15) + /**物料名称*/ + @Excel(name="物料名称",width=15) private String matName; /**单位*/ @Excel(name="单位",width=15,dictTable ="ba_unit",dicCode ="UNIT_CODE",dicText ="UNIT_ZH_NAME") @@ -259,7 +259,7 @@ public class TWzMaterialEntity implements java.io.Serializable { } /** *方法: 取得java.lang.String - *@return: java.lang.String 物资编码 + *@return: java.lang.String 物料编码 */ @Column(name ="MAT_CODE",nullable=true,length=32) @@ -269,14 +269,14 @@ public class TWzMaterialEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资编码 + *@param: java.lang.String 物料编码 */ public void setMatCode(String matCode){ this.matCode = matCode; } /** *方法: 取得java.lang.String - *@return: java.lang.String 物资名称 + *@return: java.lang.String 物料名称 */ @Column(name ="MAT_NAME",nullable=true,length=132) @@ -286,7 +286,7 @@ public class TWzMaterialEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资名称 + *@param: java.lang.String 物料名称 */ public void setMatName(String matName){ this.matName = matName; diff --git a/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java b/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java index 74d722fd..b2b54050 100644 --- a/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java +++ b/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java @@ -32,11 +32,11 @@ import org.jeecgframework.poi.excel.annotation.Excel; public class VWzPoWqEntity implements java.io.Serializable { /**id*/ private String id; - /**物资编码*/ - @Excel(name="物资编码",width=15) + /**物料编码*/ + @Excel(name="物料编码",width=15) private String matCode; - /**物资名称*/ - @Excel(name="物资名称",width=15) + /**物料名称*/ + @Excel(name="物料名称",width=15) private String matName; /**单位*/ @Excel(name="单位",width=15) @@ -80,7 +80,7 @@ public class VWzPoWqEntity implements java.io.Serializable { } /** *方法: 取得java.lang.String - *@return: java.lang.String 物资编码 + *@return: java.lang.String 物料编码 */ @Column(name ="MAT_CODE",nullable=true,length=32) @@ -90,14 +90,14 @@ public class VWzPoWqEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资编码 + *@param: java.lang.String 物料编码 */ public void setMatCode(String matCode){ this.matCode = matCode; } /** *方法: 取得java.lang.String - *@return: java.lang.String 物资名称 + *@return: java.lang.String 物料名称 */ @Column(name ="MAT_NAME",nullable=true,length=32) @@ -107,7 +107,7 @@ public class VWzPoWqEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资名称 + *@param: java.lang.String 物料名称 */ public void setMatName(String matName){ this.matName = matName; diff --git a/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java b/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java index 487ba145..f73c404c 100644 --- a/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java +++ b/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java @@ -77,13 +77,13 @@ import io.swagger.annotations.ApiParam; /** * @Title: Controller - * @Description: 物资出库 + * @Description: 物料出库 * @author onlineGenerator * @date 2018-05-20 21:43:29 * @version V1.0 * */ -@Api(value="TWzCkHead",description="物资出库",tags="tWzCkHeadController") +@Api(value="TWzCkHead",description="物料出库",tags="tWzCkHeadController") @Controller @RequestMapping("/tWzCkHeadController") public class TWzCkHeadController extends BaseController { @@ -103,7 +103,7 @@ public class TWzCkHeadController extends BaseController { JdbcDao jdbcDao; /** - * 物资出库列表 页面跳转 + * 物料出库列表 页面跳转 * * @return */ @@ -174,7 +174,7 @@ public class TWzCkHeadController extends BaseController { /** - * 删除物资出库 + * 删除物料出库 * * @return */ @@ -183,13 +183,13 @@ public class TWzCkHeadController extends BaseController { public AjaxJson doDel(TWzCkHeadEntity tWzCkHead, HttpServletRequest request) { AjaxJson j = new AjaxJson(); tWzCkHead = systemService.getEntity(TWzCkHeadEntity.class, tWzCkHead.getId()); - String message = "物资出库删除成功"; + String message = "物料出库删除成功"; try{ tWzCkHeadService.delMain(tWzCkHead); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资出库删除失败"; + message = "物料出库删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -197,7 +197,7 @@ public class TWzCkHeadController extends BaseController { } /** - * 批量删除物资出库 + * 批量删除物料出库 * * @return */ @@ -205,7 +205,7 @@ public class TWzCkHeadController extends BaseController { @ResponseBody public AjaxJson doBatchDel(String ids,HttpServletRequest request){ AjaxJson j = new AjaxJson(); - String message = "物资出库删除成功"; + String message = "物料出库删除成功"; try{ for(String id:ids.split(",")){ TWzCkHeadEntity tWzCkHead = systemService.getEntity(TWzCkHeadEntity.class, @@ -216,7 +216,7 @@ public class TWzCkHeadController extends BaseController { } }catch(Exception e){ e.printStackTrace(); - message = "物资出库删除失败"; + message = "物料出库删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -225,7 +225,7 @@ public class TWzCkHeadController extends BaseController { /** - * 添加物资出库 + * 添加物料出库 * * @return */ @@ -263,7 +263,7 @@ public class TWzCkHeadController extends BaseController { /** - * 添加物资出库 + * 添加物料出库 * * @return */ @@ -298,7 +298,7 @@ public class TWzCkHeadController extends BaseController { systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资出库添加失败"; + message = "物料出库添加失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -345,7 +345,7 @@ public class TWzCkHeadController extends BaseController { sheet.setColumnWidth(6, 10 * 256); sheet.setColumnWidth(7, 10 * 256); sheet.setColumnWidth(8, 15 * 256); - //{ "序号", "物资编码", "物资名称", "仓库", "领用人", "数量", "单位", "单价","金额" } + //{ "序号", "物料编码", "物料名称", "仓库", "领用人", "数量", "单位", "单价","金额" } // sheet.setColumnWidth(7, 8 * 256); // sheet.setColumnWidth(8, 8 * 256); // 创建第一行 @@ -442,7 +442,7 @@ public class TWzCkHeadController extends BaseController { Row rowColumnName = sheet.createRow((short) 4); // 列名 rowColumnName.setHeight((short) 500); - String[] columnNames = { "序号", "物资编码", "物资名称", "仓库", "领用人", "数量", "单位", "单价", + String[] columnNames = { "序号", "物料编码", "物料名称", "仓库", "领用人", "数量", "单位", "单价", "金额" }; Double totalAmount = 0d; @@ -590,7 +590,7 @@ public class TWzCkHeadController extends BaseController { /** - * 更新物资出库 + * 更新物料出库 * * @return */ @@ -621,7 +621,7 @@ public class TWzCkHeadController extends BaseController { /** - * 更新物资出库 + * 更新物料出库 * * @return */ @@ -649,7 +649,7 @@ public class TWzCkHeadController extends BaseController { systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "更新物资出库失败"; + message = "更新物料出库失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -657,7 +657,7 @@ public class TWzCkHeadController extends BaseController { } /** - * 物资出库新增页面跳转 + * 物料出库新增页面跳转 * * @return */ @@ -671,7 +671,7 @@ public class TWzCkHeadController extends BaseController { } /** - * 物资出库编辑页面跳转 + * 物料出库编辑页面跳转 * * @return */ @@ -765,9 +765,9 @@ public class TWzCkHeadController extends BaseController { } } } - map.put(NormalExcelConstants.FILE_NAME,"物资出库"); + map.put(NormalExcelConstants.FILE_NAME,"物料出库"); map.put(NormalExcelConstants.CLASS,TWzCkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物资出库列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + map.put(NormalExcelConstants.PARAMS,new ExportParams("物料出库列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), "导出信息")); map.put(NormalExcelConstants.DATA_LIST,pageList); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -818,9 +818,9 @@ public class TWzCkHeadController extends BaseController { */ @RequestMapping(params = "exportXlsByT") public String exportXlsByT(ModelMap map) { - map.put(NormalExcelConstants.FILE_NAME,"物资出库"); + map.put(NormalExcelConstants.FILE_NAME,"物料出库"); map.put(NormalExcelConstants.CLASS,TWzCkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物资出库列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + map.put(NormalExcelConstants.PARAMS,new ExportParams("物料出库列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), "导出信息")); map.put(NormalExcelConstants.DATA_LIST,new ArrayList()); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -839,7 +839,7 @@ public class TWzCkHeadController extends BaseController { @RequestMapping(method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="物资出库列表信息",produces="application/json",httpMethod="GET") + @ApiOperation(value="物料出库列表信息",produces="application/json",httpMethod="GET") public ResponseMessage> list() { List list= tWzCkHeadService.getList(TWzCkHeadEntity.class); List pageList=new ArrayList(); @@ -863,11 +863,11 @@ public class TWzCkHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="根据ID获取物资出库信息",notes="根据ID获取物资出库信息",httpMethod="GET",produces="application/json") + @ApiOperation(value="根据ID获取物料出库信息",notes="根据ID获取物料出库信息",httpMethod="GET",produces="application/json") public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { TWzCkHeadEntity task = tWzCkHeadService.get(TWzCkHeadEntity.class, id); if (task == null) { - return Result.error("根据ID获取物资出库信息为空"); + return Result.error("根据ID获取物料出库信息为空"); } TWzCkHeadPage page = new TWzCkHeadPage(); try { @@ -884,8 +884,8 @@ public class TWzCkHeadController extends BaseController { @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="创建物资出库") - public ResponseMessage create(@ApiParam(name="物资出库对象")@RequestBody TWzCkHeadPage tWzCkHeadPage, UriComponentsBuilder uriBuilder) { + @ApiOperation(value="创建物料出库") + public ResponseMessage create(@ApiParam(name="物料出库对象")@RequestBody TWzCkHeadPage tWzCkHeadPage, UriComponentsBuilder uriBuilder) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzCkHeadPage); if (!failures.isEmpty()) { @@ -900,7 +900,7 @@ public class TWzCkHeadController extends BaseController { MyBeanUtils.copyBeanNotNull2Bean(tWzCkHeadPage,tWzCkHead); }catch(Exception e){ logger.info(e.getMessage()); - return Result.error("保存物资出库失败"); + return Result.error("保存物料出库失败"); } tWzCkHeadService.addMain(tWzCkHead, tWzCkItemList); @@ -909,7 +909,7 @@ public class TWzCkHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="更新物资出库",notes="更新物资出库") + @ApiOperation(value="更新物料出库",notes="更新物料出库") public ResponseMessage update(@RequestBody TWzCkHeadPage tWzCkHeadPage) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzCkHeadPage); @@ -925,7 +925,7 @@ public class TWzCkHeadController extends BaseController { MyBeanUtils.copyBeanNotNull2Bean(tWzCkHeadPage,tWzCkHead); }catch(Exception e){ logger.info(e.getMessage()); - return Result.error("物资出库更新失败"); + return Result.error("物料出库更新失败"); } tWzCkHeadService.updateMain(tWzCkHead, tWzCkItemList); @@ -935,7 +935,7 @@ public class TWzCkHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除物资出库") + @ApiOperation(value="删除物料出库") public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { logger.info("delete[{}]" + id); // 验证 @@ -947,7 +947,7 @@ public class TWzCkHeadController extends BaseController { tWzCkHeadService.delMain(tWzCkHead); } catch (Exception e) { e.printStackTrace(); - return Result.error("物资出库删除失败"); + return Result.error("物料出库删除失败"); } return Result.success(); diff --git a/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java b/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java index 3fe42a64..878dff5e 100644 --- a/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java +++ b/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java @@ -80,13 +80,13 @@ import io.swagger.annotations.ApiParam; /** * @Title: Controller - * @Description: 物资采购订单 + * @Description: 物料采购订单 * @author onlineGenerator * @date 2018-05-21 13:23:13 * @version V1.0 * */ -@Api(value="TWzPoHead",description="物资采购订单",tags="tWzPoHeadController") +@Api(value="TWzPoHead",description="物料采购订单",tags="tWzPoHeadController") @Controller @RequestMapping("/tWzPoHeadController") public class TWzPoHeadController extends BaseController { @@ -103,7 +103,7 @@ public class TWzPoHeadController extends BaseController { private Validator validator; /** - * 物资采购订单列表 页面跳转 + * 物料采购订单列表 页面跳转 * * @return */ @@ -154,7 +154,7 @@ public class TWzPoHeadController extends BaseController { TagUtil.datagrid(response, dataGrid); } /** - * 删除物资采购订单 + * 删除物料采购订单 * * @return */ @@ -163,7 +163,7 @@ public class TWzPoHeadController extends BaseController { public AjaxJson doDel(TWzPoHeadEntity tWzPoHead, HttpServletRequest request) { AjaxJson j = new AjaxJson(); tWzPoHead = systemService.getEntity(TWzPoHeadEntity.class, tWzPoHead.getId()); - String message = "物资采购订单删除成功"; + String message = "物料采购订单删除成功"; try{ tWzPoHead.setBpmStatus("9"); systemService.saveOrUpdate(tWzPoHead); @@ -171,7 +171,7 @@ public class TWzPoHeadController extends BaseController { systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资采购订单删除失败"; + message = "物料采购订单删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -179,7 +179,7 @@ public class TWzPoHeadController extends BaseController { } /** - * 批量删除物资采购订单 + * 批量删除物料采购订单 * * @return */ @@ -187,7 +187,7 @@ public class TWzPoHeadController extends BaseController { @ResponseBody public AjaxJson doBatchDel(String ids,HttpServletRequest request){ AjaxJson j = new AjaxJson(); - String message = "物资采购订单删除成功"; + String message = "物料采购订单删除成功"; try{ for(String id:ids.split(",")){ TWzPoHeadEntity tWzPoHead = systemService.getEntity(TWzPoHeadEntity.class, @@ -198,7 +198,7 @@ public class TWzPoHeadController extends BaseController { } }catch(Exception e){ e.printStackTrace(); - message = "物资采购订单删除失败"; + message = "物料采购订单删除失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -366,7 +366,7 @@ public class TWzPoHeadController extends BaseController { Row rowColumnName = sheet.createRow((short) 6); // 列名 rowColumnName.setHeight((short) 500); - String[] columnNames = { "序号", "物资编码", "物资名称", "数量", "单位", + String[] columnNames = { "序号", "物料编码", "物料名称", "数量", "单位", "备注" }; for (int i = 0; i < columnNames.length; i++) { @@ -455,7 +455,7 @@ public class TWzPoHeadController extends BaseController { /** - * 添加物资采购订单 + * 添加物料采购订单 * * @return */ @@ -470,7 +470,7 @@ public class TWzPoHeadController extends BaseController { systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "物资采购订单添加失败"; + message = "物料采购订单添加失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -479,7 +479,7 @@ public class TWzPoHeadController extends BaseController { /** - * 更新物资出库 + * 更新物料出库 * * @return */ @@ -520,7 +520,7 @@ public class TWzPoHeadController extends BaseController { } /** - * 更新物资出库 + * 更新物料出库 * * @return */ @@ -545,7 +545,7 @@ public class TWzPoHeadController extends BaseController { /** - * 更新物资采购订单 + * 更新物料采购订单 * * @return */ @@ -560,7 +560,7 @@ public class TWzPoHeadController extends BaseController { systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); }catch(Exception e){ e.printStackTrace(); - message = "更新物资采购订单失败"; + message = "更新物料采购订单失败"; throw new BusinessException(e.getMessage()); } j.setMsg(message); @@ -568,7 +568,7 @@ public class TWzPoHeadController extends BaseController { } /** - * 物资采购订单新增页面跳转 + * 物料采购订单新增页面跳转 * * @return */ @@ -582,7 +582,7 @@ public class TWzPoHeadController extends BaseController { } /** - * 物资采购订单编辑页面跳转 + * 物料采购订单编辑页面跳转 * * @return */ @@ -653,9 +653,9 @@ public class TWzPoHeadController extends BaseController { } } } - map.put(NormalExcelConstants.FILE_NAME,"物资采购订单"); + map.put(NormalExcelConstants.FILE_NAME,"采购订单"); map.put(NormalExcelConstants.CLASS,TWzPoHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物资采购订单列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + map.put(NormalExcelConstants.PARAMS,new ExportParams("采购订单列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), "导出信息")); map.put(NormalExcelConstants.DATA_LIST,pageList); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -706,9 +706,9 @@ public class TWzPoHeadController extends BaseController { */ @RequestMapping(params = "exportXlsByT") public String exportXlsByT(ModelMap map) { - map.put(NormalExcelConstants.FILE_NAME,"物资采购订单"); + map.put(NormalExcelConstants.FILE_NAME,"物料采购订单"); map.put(NormalExcelConstants.CLASS,TWzPoHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物资采购订单列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + map.put(NormalExcelConstants.PARAMS,new ExportParams("物料采购订单列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), "导出信息")); map.put(NormalExcelConstants.DATA_LIST,new ArrayList()); return NormalExcelConstants.JEECG_EXCEL_VIEW; @@ -727,7 +727,7 @@ public class TWzPoHeadController extends BaseController { @RequestMapping(method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="物资采购订单列表信息",produces="application/json",httpMethod="GET") + @ApiOperation(value="物料采购订单列表信息",produces="application/json",httpMethod="GET") public ResponseMessage> list() { List list= tWzPoHeadService.getList(TWzPoHeadEntity.class); List pageList=new ArrayList(); @@ -751,11 +751,11 @@ public class TWzPoHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody - @ApiOperation(value="根据ID获取物资采购订单信息",notes="根据ID获取物资采购订单信息",httpMethod="GET",produces="application/json") + @ApiOperation(value="根据ID获取物料采购订单信息",notes="根据ID获取物料采购订单信息",httpMethod="GET",produces="application/json") public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { TWzPoHeadEntity task = tWzPoHeadService.get(TWzPoHeadEntity.class, id); if (task == null) { - return Result.error("根据ID获取物资采购订单信息为空"); + return Result.error("根据ID获取物料采购订单信息为空"); } TWzPoHeadPage page = new TWzPoHeadPage(); try { @@ -772,8 +772,8 @@ public class TWzPoHeadController extends BaseController { @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="创建物资采购订单") - public ResponseMessage create(@ApiParam(name="物资采购订单对象")@RequestBody TWzPoHeadPage tWzPoHeadPage, UriComponentsBuilder uriBuilder) { + @ApiOperation(value="创建物料采购订单") + public ResponseMessage create(@ApiParam(name="物料采购订单对象")@RequestBody TWzPoHeadPage tWzPoHeadPage, UriComponentsBuilder uriBuilder) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzPoHeadPage); if (!failures.isEmpty()) { @@ -788,7 +788,7 @@ public class TWzPoHeadController extends BaseController { MyBeanUtils.copyBeanNotNull2Bean(tWzPoHeadPage,tWzPoHead); }catch(Exception e){ logger.info(e.getMessage()); - return Result.error("保存物资采购订单失败"); + return Result.error("保存物料采购订单失败"); } tWzPoHeadService.addMain(tWzPoHead, tWzPoItemList); @@ -797,7 +797,7 @@ public class TWzPoHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - @ApiOperation(value="更新物资采购订单",notes="更新物资采购订单") + @ApiOperation(value="更新物料采购订单",notes="更新物料采购订单") public ResponseMessage update(@RequestBody TWzPoHeadPage tWzPoHeadPage) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. Set> failures = validator.validate(tWzPoHeadPage); @@ -813,7 +813,7 @@ public class TWzPoHeadController extends BaseController { MyBeanUtils.copyBeanNotNull2Bean(tWzPoHeadPage,tWzPoHead); }catch(Exception e){ logger.info(e.getMessage()); - return Result.error("物资采购订单更新失败"); + return Result.error("物料采购订单更新失败"); } tWzPoHeadService.updateMain(tWzPoHead, tWzPoItemList); @@ -823,7 +823,7 @@ public class TWzPoHeadController extends BaseController { @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除物资采购订单") + @ApiOperation(value="删除物料采购订单") public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { logger.info("delete[{}]" + id); // 验证 @@ -835,7 +835,7 @@ public class TWzPoHeadController extends BaseController { tWzPoHeadService.delMain(tWzPoHead); } catch (Exception e) { e.printStackTrace(); - return Result.error("物资采购订单删除失败"); + return Result.error("物料采购订单删除失败"); } return Result.success(); diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java index a31b201f..e11640eb 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java @@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; /** * @Title: Entity - * @Description: 物资出库 + * @Description: 物料出库 * @author onlineGenerator * @date 2018-05-20 21:43:29 * @version V1.0 diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java index 55831c73..74ec89ad 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java @@ -4,10 +4,10 @@ import org.jeecgframework.poi.excel.annotation.Excel; public class TWzCkItemDto { - /**物资名称*/ + /**物料名称*/ @Excel(name="商品编号",width=15) private String matCode; - /**物资名称*/ + /**物料名称*/ @Excel(name="商品名称",width=15) private String matName; /**仓库*/ @@ -22,7 +22,7 @@ public class TWzCkItemDto { /**单价*/ @Excel(name="单价",width=15) private String matPrice; - /**物资单位*/ + /**物料单位*/ @Excel(name="单位",width=15) private String matUnit; /**总价*/ diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java index 612dc468..1935ddd0 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java @@ -51,11 +51,11 @@ public class TWzCkItemEntity implements java.io.Serializable { private String bpmStatus; /**外键*/ private String wzckHid; - /**物资编码*/ - @Excel(name="物资编码",width=15) + /**物料编码*/ + @Excel(name="物料编码",width=15) private String matCode; - /**物资名称*/ - @Excel(name="物资名称",width=15) + /**物料名称*/ + @Excel(name="物料名称",width=15) private String matName; /**数量*/ @Excel(name="数量",width=15) @@ -291,7 +291,7 @@ public class TWzCkItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资编码 + *@return: java.lang.String 物料编码 */ @Column(name ="MAT_CODE",nullable=true,length=32) @@ -301,7 +301,7 @@ public class TWzCkItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资编码 + *@param: java.lang.String 物料编码 */ public void setMatCode(String matCode){ this.matCode = matCode; @@ -309,7 +309,7 @@ public class TWzCkItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资名称 + *@return: java.lang.String 物料名称 */ @Column(name ="MAT_NAME",nullable=true,length=32) @@ -319,7 +319,7 @@ public class TWzCkItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资名称 + *@param: java.lang.String 物料名称 */ public void setMatName(String matName){ this.matName = matName; diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java index 5d0cdec7..e65e3c5e 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java @@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; /** * @Title: Entity - * @Description: 物资采购订单 + * @Description: 物料采购订单 * @author onlineGenerator * @date 2018-05-21 13:23:13 * @version V1.0 diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java index ac3de0b2..429b0bcf 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java @@ -51,11 +51,11 @@ public class TWzPoItemEntity implements java.io.Serializable { private String bpmStatus; /**外键*/ private String poId; - /**物资编码*/ - @Excel(name="物资编码",width=15) + /**物料编码*/ + @Excel(name="物料编码",width=15) private String matCode; - /**物资名称*/ - @Excel(name="物资名称",width=15) + /**物料名称*/ + @Excel(name="物料名称",width=15) private String matName; /**数量*/ @Excel(name="数量",width=15) @@ -289,7 +289,7 @@ public class TWzPoItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资编码 + *@return: java.lang.String 物料编码 */ @Column(name ="MAT_CODE",nullable=true,length=32) @@ -299,7 +299,7 @@ public class TWzPoItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资编码 + *@param: java.lang.String 物料编码 */ public void setMatCode(String matCode){ this.matCode = matCode; @@ -307,7 +307,7 @@ public class TWzPoItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资名称 + *@return: java.lang.String 物料名称 */ @Column(name ="MAT_NAME",nullable=true,length=32) @@ -317,7 +317,7 @@ public class TWzPoItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资名称 + *@param: java.lang.String 物料名称 */ public void setMatName(String matName){ this.matName = matName; diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java index 446f5258..d3c54edc 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java @@ -6,13 +6,13 @@ public class TWzRkItemDto { /**主键*/ private Integer id; - /**物资名称*/ + /**物料名称*/ @Excel(name="编码/商品名称",width=15) private String matName; - /**物资编码*/ + /**物料编码*/ @Excel(name="规格",width=15) private String spec; - /**物资单位*/ + /**物料单位*/ @Excel(name="单位",width=15) private String matUnit; /**仓库*/ diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java index 9d939ce5..56a90509 100644 --- a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java +++ b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java @@ -51,17 +51,17 @@ public class TWzRkItemEntity implements java.io.Serializable { private String bpmStatus; /**外键*/ private String wzrkHid; - /**物资编码*/ - @Excel(name="物资编码",width=15) + /**物料编码*/ + @Excel(name="物料编码",width=15) private String matCode; - /**物资名称*/ - @Excel(name="物资名称",width=15) + /**物料名称*/ + @Excel(name="物料名称",width=15) private String matName; /**入库数量*/ @Excel(name="入库数量",width=15) private String matQty; - /**物资单位*/ - @Excel(name="物资单位",width=15) + /**物料单位*/ + @Excel(name="物料单位",width=15) private String matUnit; /**仓库*/ @Excel(name="仓库",width=15) @@ -292,7 +292,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资编码 + *@return: java.lang.String 物料编码 */ @Column(name ="MAT_CODE",nullable=true,length=32) @@ -302,7 +302,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资编码 + *@param: java.lang.String 物料编码 */ public void setMatCode(String matCode){ this.matCode = matCode; @@ -310,7 +310,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资名称 + *@return: java.lang.String 物料名称 */ @Column(name ="MAT_NAME",nullable=true,length=32) @@ -320,7 +320,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资名称 + *@param: java.lang.String 物料名称 */ public void setMatName(String matName){ this.matName = matName; @@ -346,7 +346,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 取得java.lang.String - *@return: java.lang.String 物资单位 + *@return: java.lang.String 物料单位 */ @Column(name ="MAT_UNIT",nullable=true,length=32) @@ -356,7 +356,7 @@ public class TWzRkItemEntity implements java.io.Serializable { /** *方法: 设置java.lang.String - *@param: java.lang.String 物资单位 + *@param: java.lang.String 物料单位 */ public void setMatUnit(String matUnit){ this.matUnit = matUnit; diff --git a/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java b/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java index 01c28974..46e55e86 100644 --- a/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java +++ b/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java @@ -21,7 +21,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection; /** * @Title: Entity - * @Description: 物资出库 + * @Description: 物料出库 * @author onlineGenerator * @date 2018-05-20 21:43:29 * @version V1.0 diff --git a/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java b/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java index b1e09324..2cb0516c 100644 --- a/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java +++ b/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java @@ -21,7 +21,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection; /** * @Title: Entity - * @Description: 物资采购订单 + * @Description: 物料采购订单 * @author onlineGenerator * @date 2018-05-21 13:23:13 * @version V1.0 diff --git a/src/main/webapp/webpage/com/zzjee/wz/tWzMaterial-add.jsp b/src/main/webapp/webpage/com/zzjee/wz/tWzMaterial-add.jsp index 2613c150..b9888e8e 100644 --- a/src/main/webapp/webpage/com/zzjee/wz/tWzMaterial-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/wz/tWzMaterial-add.jsp @@ -3,7 +3,7 @@ - 物资 + 物料