From 6f294fad6234c0c976d90520d57219b6cebc20f7 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 18 Dec 2024 00:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A1=E9=87=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=BA=E5=A4=9A=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/constants/ExceptionConstants.java | 2 +- .../java/com/jsh/erp/controller/DepotItemController.java | 2 +- .../com/jsh/erp/service/depotItem/DepotItemService.java | 4 ++-- .../main/java/com/jsh/erp/service/unit/UnitService.java | 8 ++++---- jshERP-web/src/api/api.js | 2 +- jshERP-web/src/views/material/modules/MaterialModal.vue | 6 +++--- jshERP-web/src/views/system/UnitList.vue | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 2a72e1b59..e6f826727 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -286,7 +286,7 @@ public class ExceptionConstants { public static final String MATERIAL_BARCODE_EXISTS_MSG = "商品条码:%s重复"; //商品-单位匹配不上 public static final int MATERIAL_UNIT_MATE_CODE = 8000006; - public static final String MATERIAL_UNIT_MATE_MSG = "抱歉，商品条码:%s的单位匹配不上，请完善计量单位信息！"; + public static final String MATERIAL_UNIT_MATE_MSG = "抱歉，商品条码:%s的单位匹配不上，请完善多单位信息！"; //商品条码长度应该为4到40位 public static final int MATERIAL_BARCODE_LENGTH_ERROR_CODE = 8000007; public static final String MATERIAL_BARCODE_LENGTH_ERROR_MSG = "商品条码:%s的长度应该为4到40位"; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 97e82177f..4e5a2d534 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -229,7 +229,7 @@ public class DepotItemController { item.put("mfrs", diEx.getMMfrs()); item.put("materialOther", depotItemService.getOtherInfo(mpArr, diEx)); BigDecimal stock; - Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询计量单位信息 + Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询多单位信息 String materialUnit = diEx.getMaterialUnit(); if(StringUtil.isNotEmpty(diEx.getSku())){ stock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index cf1b2ce61..aba137574 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -505,7 +505,7 @@ public class DepotItemService { depotItem.setLinkId(rowObj.getLong("linkId")); } //以下进行单位换算 - Unit unitInfo = materialService.findUnit(materialExtend.getMaterialId()); //查询计量单位信息 + Unit unitInfo = materialService.findUnit(materialExtend.getMaterialId()); //查询多单位信息 if (StringUtil.isExist(rowObj.get("operNumber"))) { depotItem.setOperNumber(rowObj.getBigDecimal("operNumber")); String unit = rowObj.get("unit").toString(); @@ -1071,7 +1071,7 @@ public class DepotItemService { public void updateCurrentUnitPrice(DepotItem depotItem) throws Exception { Boolean forceFlag = systemConfigService.getForceApprovalFlag(); Boolean inOutManageFlag = systemConfigService.getInOutManageFlag(); - //查询计量单位信息 + //查询多单位信息 Unit unitInfo = materialService.findUnit(depotItem.getMaterialId()); List itemList = findDetailByDepotIdsAndMaterialIdList(null, forceFlag, inOutManageFlag, depotItem.getSku(), depotItem.getBatchNumber(), null, null, null, depotItem.getMaterialId(), null, null); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java index b99197cdd..e66e12ffd 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -108,7 +108,7 @@ public class UnitService { parseNameByUnit(unit); unit.setEnabled(true); result=unitMapper.insertSelective(unit); - logService.insertLog("计量单位", + logService.insertLog("多单位", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(unit.getName()).toString(), request); }catch(Exception e){ JshException.writeFail(logger, e); @@ -129,7 +129,7 @@ public class UnitService { if(unit.getRatioThree()==null) { unitMapperEx.updateRatioThreeById(unit.getId()); } - logService.insertLog("计量单位", + logService.insertLog("多单位", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(unit.getName()).toString(), request); }catch(Exception e){ JshException.writeFail(logger, e); @@ -186,7 +186,7 @@ public class UnitService { for(Unit unit: list){ sb.append("[").append(unit.getName()).append("]"); } - logService.insertLog("计量单位", sb.toString(), + logService.insertLog("多单位", sb.toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); User userInfo=userService.getCurrentUser(); //校验通过执行删除操作 @@ -291,7 +291,7 @@ public class UnitService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchSetStatus(Boolean status, String ids)throws Exception { - logService.insertLog("计量单位", + logService.insertLog("多单位", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ENABLED).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); List unitIds = StringUtil.strToLongList(ids); diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js index 888a38424..b80315a17 100644 --- a/jshERP-web/src/api/api.js +++ b/jshERP-web/src/api/api.js @@ -94,7 +94,7 @@ const addUserBusiness = (params)=>postAction("/userBusiness/add",params); const editUserBusiness = (params)=>putAction("/userBusiness/update",params); const checkUserBusiness = (params)=>getAction("/userBusiness/checkIsValueExist",params); const updateBtnStrByRoleId = (params)=>postAction("/userBusiness/updateBtnStr",params); -//计量单位 +//多单位 const addUnit = (params)=>postAction("/unit/add",params); const editUnit = (params)=>putAction("/unit/update",params); const checkUnit = (params)=>getAction("/unit/checkIsNameExist",params); diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index fef396f22..bd7637438 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -37,7 +37,7 @@ @@ -48,7 +48,7 @@
新增计量单位
+ @mousedown="e => e.preventDefault()" @click="addUnit"> 新增多单位 @@ -1234,7 +1234,7 @@ }, addUnit() { this.$refs.unitModalForm.add(); - this.$refs.unitModalForm.title = "新增计量单位"; + this.$refs.unitModalForm.title = "新增多单位"; this.$refs.unitModalForm.disableSubmit = false; }, unitModalFormOk() { diff --git a/jshERP-web/src/views/system/UnitList.vue b/jshERP-web/src/views/system/UnitList.vue index 5fa10b10a..86d366cc7 100644 --- a/jshERP-web/src/views/system/UnitList.vue +++ b/jshERP-web/src/views/system/UnitList.vue @@ -8,8 +8,8 @@ - - + + @@ -105,7 +105,7 @@ align:"center", scopedSlots: { customRender: 'action' }, }, - { title: '计量单位', align:"left", dataIndex: 'name', width:200 }, + { title: '单位名称', align:"left", dataIndex: 'name', width:200 }, { title: '基本单位', align:"left", dataIndex: 'basicUnit', width:80 }, { title: '副单位', align:"left", dataIndex: 'otherUnit', width:100, customRender:function (t,r,index) {