From d23d8b0d136f71fcffaac561ea64021f21355f4e Mon Sep 17 00:00:00 2001 From: xs Date: Wed, 20 Aug 2025 16:13:54 +0800 Subject: [PATCH] =?UTF-8?q?4.1.0=20=E7=89=A9=E6=96=99=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hw/mes/api/domain/MesOrderBind.java | 4 ++-- .../com/hw/mes/domain/MesBasePalletInfo.java | 4 ++-- .../java/com/hw/mes/domain/MesMaterialBom.java | 4 ++-- .../java/com/hw/mes/domain/MesProductOrder.java | 2 +- .../java/com/hw/mes/domain/MesProductPlan.java | 2 +- .../com/hw/mes/domain/MesRaiseCapitalBom.java | 4 ++-- .../com/hw/mes/service/impl/MesImportImpl.java | 12 ++++++------ .../impl/MesRaiseCapitalBomServiceImpl.java | 2 +- .../java/com/hw/wms/domain/MesProductOrder.java | 2 +- .../main/java/com/hw/wms/domain/WmsRawStock.java | 4 ++-- .../java/com/hw/wms/domain/WmsStockTotal.java | 4 ++-- .../hw/wms/domain/vo/WmsStockTotalExportVo.java | 2 +- .../src/views/board/common/applyRawOutstock.vue | 2 +- hw-ui/src/views/board/common/applyRawReturn.vue | 2 +- hw-ui/src/views/board/fifthFloor/index.vue | 16 ++++++++-------- hw-ui/src/views/board/firstFloor/index.vue | 2 +- hw-ui/src/views/board/fourthFloor/assemble.vue | 2 +- hw-ui/src/views/board/fourthFloor/laserLight.vue | 2 +- hw-ui/src/views/board/fourthFloor/weld.vue | 2 +- hw-ui/src/views/login.vue | 8 ++++---- hw-ui/src/views/login2.vue | 6 +++--- hw-ui/src/views/mes/barcode/index.vue | 2 +- .../src/views/mes/saleOrder/bindingPurchase.vue | 2 +- hw-ui/src/views/wms/common/applyRawOutstock.vue | 2 +- hw-ui/src/views/wms/info/move/detail.vue | 2 +- .../views/wms/info/rawOutstockDetail/index.vue | 6 +++--- 26 files changed, 51 insertions(+), 51 deletions(-) diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java index fb4f3ccd..dc87715c 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java @@ -77,9 +77,9 @@ public class MesOrderBind extends BaseEntity { private Long materialId; /** - * 物料编号 + * 物料编码 */ - @Excel(name = "物料编号") + @Excel(name = "物料编码") private String materialCode; /** diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java index c3dcc180..237a31b1 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java @@ -27,8 +27,8 @@ public class MesBasePalletInfo extends BaseEntity @Excel(name = "物料ID，关联物料信息主键") private Long materialId; - /** 物料编号 */ - @Excel(name = "物料编号") + /** 物料编码 */ + @Excel(name = "物料编码") private String materialCode; /** 物料名称 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java index ebd14763..acaa3349 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java @@ -83,9 +83,9 @@ public class MesMaterialBom extends TreeEntity { private String activeFlag; /** - * 物料编号 + * 物料编码 */ - @Excel(name = "物料编号") + @Excel(name = "物料编码") private String materialCode; /** diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java index 7c0db55e..bf9326f0 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java @@ -209,7 +209,7 @@ public class MesProductOrder extends BaseEntity { private String materialSpec; /** - * 生产物料编号 + * 生产物料编码 */ private String produceMaterialCode; diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java index 9620091d..68e4030e 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java @@ -161,7 +161,7 @@ public class MesProductPlan extends BaseEntity private Date planDeliveryDate; /** - * 物料编号 + * 物料编码 */ private String materialCode; diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java index 21f93ceb..e42f3b1f 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java @@ -112,9 +112,9 @@ public class MesRaiseCapitalBom extends BaseEntity { private Long erpMaterialId; /** - * 物料编号 + * 物料编码 */ - @Excel(name = "物料编号") + @Excel(name = "物料编码") private String materialCode; private String materialSpec; diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java index 34a49b47..8b082300 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java @@ -188,7 +188,7 @@ public class MesImportImpl implements IMesImportService { // productBom = productBom.replaceAll("（.*?）", ""); // MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); // if (productMaterial == null) { -// throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！"); +// throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！"); // } // // i = i + 3;//标题下一行 @@ -253,7 +253,7 @@ public class MesImportImpl implements IMesImportService { // materialBom.setCreateBy(operName); // bomList.add(materialBom); // } else { -// failureMsg.append("物料编号：").append(materialCode).append("|"); +// failureMsg.append("物料编码：").append(materialCode).append("|"); // } // } // i++; @@ -324,7 +324,7 @@ public class MesImportImpl implements IMesImportService { // productBom = productBom.replaceAll("(.*?)", ""); MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); if (productMaterial == null) { - throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！"); + throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！"); } i = i + 2;//标题下一行 @@ -419,7 +419,7 @@ public class MesImportImpl implements IMesImportService { } bomList.add(materialBom); } else { - failureMsg.append("物料编号：").append(materialCode).append("|"); + failureMsg.append("物料编码：").append(materialCode).append("|"); } } i++; @@ -516,7 +516,7 @@ public class MesImportImpl implements IMesImportService { // productBom = productBom.replaceAll("(.*?)", ""); MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); if (productMaterial != null) { - throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息已存在！"); + throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息已存在！"); } @@ -585,7 +585,7 @@ public class MesImportImpl implements IMesImportService { if (StringUtils.isNotEmpty(materialCode) && !materialCode.equals("物料编码")) { MesBaseMaterialInfo materialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(materialCode); if(materialInfo!=null){ - throw new ServiceException("物料编号："+materialCode+"已经存在"); + throw new ServiceException("物料编码："+materialCode+"已经存在"); } materialInfo = new MesBaseMaterialInfo(); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java index 5b264d56..7d6309c7 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java @@ -104,7 +104,7 @@ public class MesRaiseCapitalBomServiceImpl implements IMesRaiseCapitalBomService || !raiseCapitalBom.getStandardAmount().equals(mesRaiseCapitalBom.getStandardAmount())){ raiseCapitalBom.setUpdateFlag(WfConstants.PA_UPDATE_FLAG_YES); mesRaiseCapitalBomMapper.insertMesRaiseCapitalBom(raiseCapitalBom); - mesRaiseCapitalBom.setRemark("已修改,原物料编号：" + raiseCapitalBom.getMaterialCode()); + mesRaiseCapitalBom.setRemark("已修改,原物料编码：" + raiseCapitalBom.getMaterialCode()); } return mesRaiseCapitalBomMapper.updateMesRaiseCapitalBom(mesRaiseCapitalBom); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java index 8b51101b..f81af828 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java @@ -207,7 +207,7 @@ public class MesProductOrder extends BaseEntity { private String materialSpec; /** - * 生产物料编号 + * 生产物料编码 */ private String produceMaterialCode; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java index c38924b0..b4505833 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java @@ -61,9 +61,9 @@ public class WmsRawStock extends BaseEntity { private Long materialId; /** - * 物料编号 + * 物料编码 */ - @Excel(name = "物料编号") + @Excel(name = "物料编码") private String materialCode; /** diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java index c89de011..f0e5aadc 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java @@ -59,9 +59,9 @@ public class WmsStockTotal extends BaseEntity { /** - * 物料编号 + * 物料编码 */ - @Excel(name = "物料编号") + @Excel(name = "物料编码") private String materialCode; /** diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java index d6dbe764..fbe92afb 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java @@ -16,7 +16,7 @@ public class WmsStockTotalExportVo extends BaseEntity { /** - * 物料编号 + * 物料编码 */ @Excel(name = "物料编码") private String materialCode; diff --git a/hw-ui/src/views/board/common/applyRawOutstock.vue b/hw-ui/src/views/board/common/applyRawOutstock.vue index afb0c664..00a4497b 100644 --- a/hw-ui/src/views/board/common/applyRawOutstock.vue +++ b/hw-ui/src/views/board/common/applyRawOutstock.vue @@ -56,7 +56,7 @@ v-loading="loading" > diff --git a/hw-ui/src/views/board/common/applyRawReturn.vue b/hw-ui/src/views/board/common/applyRawReturn.vue index 519994ba..11e0c25a 100644 --- a/hw-ui/src/views/board/common/applyRawReturn.vue +++ b/hw-ui/src/views/board/common/applyRawReturn.vue @@ -44,7 +44,7 @@ v-if="materialVisible" > diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue index d853d4ff..aad9bb7d 100644 --- a/hw-ui/src/views/board/fifthFloor/index.vue +++ b/hw-ui/src/views/board/fifthFloor/index.vue @@ -1,6 +1,6 @@