xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.1.0

Browse Source 
物料编号统一改为物料编码
master
xs 20 hours ago
parent bceb5d5d5a
commit d23d8b0d13
26 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesOrderBind.java
Unescape Escape View File

@ -77,9 +77,9 @@ public class MesOrderBind extends BaseEntity {
private Long materialId; private Long materialId;
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
/** /**

4
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
Unescape Escape View File

@ -27,8 +27,8 @@ public class MesBasePalletInfo extends BaseEntity
@Excel(name = "物料ID，关联物料信息主键") @Excel(name = "物料ID，关联物料信息主键")
private Long materialId; private Long materialId;
/** 物料编号 */ /** 物料编码 */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
/** 物料名称 */ /** 物料名称 */

4
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java
Unescape Escape View File

@ -83,9 +83,9 @@ public class MesMaterialBom extends TreeEntity {
private String activeFlag; private String activeFlag;
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
/** /**

2
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductOrder.java
Unescape Escape View File

@ -209,7 +209,7 @@ public class MesProductOrder extends BaseEntity {
private String materialSpec; private String materialSpec;
/** /**
* 生产物料编号 * 生产物料编码
*/ */
private String produceMaterialCode; private String produceMaterialCode;

2
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java
Unescape Escape View File

@ -161,7 +161,7 @@ public class MesProductPlan extends BaseEntity
private Date planDeliveryDate; private Date planDeliveryDate;
/** /**
* 物料编号 * 物料编码
*/ */
private String materialCode; private String materialCode;

4
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesRaiseCapitalBom.java
Unescape Escape View File

@ -112,9 +112,9 @@ public class MesRaiseCapitalBom extends BaseEntity {
private Long erpMaterialId; private Long erpMaterialId;
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
private String materialSpec; private String materialSpec;

12
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesImportImpl.java
Unescape Escape View File

@ -188,7 +188,7 @@ public class MesImportImpl implements IMesImportService {
// productBom = productBom.replaceAll("（.*?）", ""); // productBom = productBom.replaceAll("（.*?）", "");
// MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); // MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
// if (productMaterial == null) { // if (productMaterial == null) {
// throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！"); // throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！");
// } // }
// //
// i = i + 3;//标题下一行 // i = i + 3;//标题下一行
@ -253,7 +253,7 @@ public class MesImportImpl implements IMesImportService {
// materialBom.setCreateBy(operName); // materialBom.setCreateBy(operName);
// bomList.add(materialBom); // bomList.add(materialBom);
// } else { // } else {
// failureMsg.append("物料编号：").append(materialCode).append("|"); // failureMsg.append("物料编码：").append(materialCode).append("|");
// } // }
// } // }
// i++; // i++;
@ -324,7 +324,7 @@ public class MesImportImpl implements IMesImportService {
// productBom = productBom.replaceAll("(.*?)", ""); // productBom = productBom.replaceAll("(.*?)", "");
MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
if (productMaterial == null) { if (productMaterial == null) {
throw new ServiceException("Excel格式错误:物料编号：" + productBom + "的信息不存在！"); throw new ServiceException("Excel格式错误:物料编码：" + productBom + "的信息不存在！");
} }
i = i + 2;//标题下一行 i = i + 2;//标题下一行
@ -419,7 +419,7 @@ public class MesImportImpl implements IMesImportService {
} }
bomList.add(materialBom); bomList.add(materialBom);
} else { } else {
failureMsg.append("物料编号：").append(materialCode).append("|"); failureMsg.append("物料编码：").append(materialCode).append("|");
} }
} }
i++; i++;
@ -516,7 +516,7 @@ public class MesImportImpl implements IMesImportService {
// productBom = productBom.replaceAll("(.*?)", ""); // productBom = productBom.replaceAll("(.*?)", "");
MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom); MesBaseMaterialInfo productMaterial = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(productBom);
if (productMaterial != null) { 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("物料编码")) { if (StringUtils.isNotEmpty(materialCode) && !materialCode.equals("物料编码")) {
MesBaseMaterialInfo materialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(materialCode); MesBaseMaterialInfo materialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(materialCode);
if(materialInfo!=null){ if(materialInfo!=null){
throw new ServiceException("物料编号："+materialCode+"已经存在"); throw new ServiceException("物料编码："+materialCode+"已经存在");
} }
materialInfo = new MesBaseMaterialInfo(); materialInfo = new MesBaseMaterialInfo();

2
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesRaiseCapitalBomServiceImpl.java
Unescape Escape View File

@ -104,7 +104,7 @@ public class MesRaiseCapitalBomServiceImpl implements IMesRaiseCapitalBomService
|| !raiseCapitalBom.getStandardAmount().equals(mesRaiseCapitalBom.getStandardAmount())){ || !raiseCapitalBom.getStandardAmount().equals(mesRaiseCapitalBom.getStandardAmount())){
raiseCapitalBom.setUpdateFlag(WfConstants.PA_UPDATE_FLAG_YES); raiseCapitalBom.setUpdateFlag(WfConstants.PA_UPDATE_FLAG_YES);
mesRaiseCapitalBomMapper.insertMesRaiseCapitalBom(raiseCapitalBom); mesRaiseCapitalBomMapper.insertMesRaiseCapitalBom(raiseCapitalBom);
mesRaiseCapitalBom.setRemark("已修改,原物料编号：" + raiseCapitalBom.getMaterialCode()); mesRaiseCapitalBom.setRemark("已修改,原物料编码：" + raiseCapitalBom.getMaterialCode());
} }
return mesRaiseCapitalBomMapper.updateMesRaiseCapitalBom(mesRaiseCapitalBom); return mesRaiseCapitalBomMapper.updateMesRaiseCapitalBom(mesRaiseCapitalBom);

2
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java
Unescape Escape View File

@ -207,7 +207,7 @@ public class MesProductOrder extends BaseEntity {
private String materialSpec; private String materialSpec;
/** /**
* 生产物料编号 * 生产物料编码
*/ */
private String produceMaterialCode; private String produceMaterialCode;

4
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java
Unescape Escape View File

@ -61,9 +61,9 @@ public class WmsRawStock extends BaseEntity {
private Long materialId; private Long materialId;
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
/** /**

4
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java
Unescape Escape View File

@ -59,9 +59,9 @@ public class WmsStockTotal extends BaseEntity {
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编号") @Excel(name = "物料编码")
private String materialCode; private String materialCode;
/** /**

2
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/vo/WmsStockTotalExportVo.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class WmsStockTotalExportVo extends BaseEntity {
/** /**
* 物料编号 * 物料编码
*/ */
@Excel(name = "物料编码") @Excel(name = "物料编码")
private String materialCode; private String materialCode;

2
hw-ui/src/views/board/common/applyRawOutstock.vue
Unescape Escape View File

@ -56,7 +56,7 @@
v-loading="loading" v-loading="loading"
> >
<el-table-column <el-table-column
label="物料编号" label="物料编码"
prop="materialCode" prop="materialCode"
> >
</el-table-column> </el-table-column>

2
hw-ui/src/views/board/common/applyRawReturn.vue
Unescape Escape View File

@ -44,7 +44,7 @@
v-if="materialVisible" v-if="materialVisible"
> >
<el-table-column <el-table-column
label="物料编号" label="物料编码"
prop="materialCode" prop="materialCode"
> >
</el-table-column> </el-table-column>

16
hw-ui/src/views/board/fifthFloor/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="headTitle">京源环保生产管理系统</div> <div class="headTitle">京源环保MOM生产管理系统</div>
<div class="chartBox chartBox1"> <div class="chartBox chartBox1">
<div class="title">生产明细</div> <div class="title">生产明细</div>
@ -872,14 +872,14 @@ export default {
// }); // });
// }, 60 * 1000) // }, 60 * 1000)
getLoginStationInfo().then(e => { getLoginStationInfo().then(e => {
if(!e.data){ // if(!e.data){
this.$modal.msgError("登录工位有误"); // this.$modal.msgError("登录工位有误");
return; // return;
} // }
this.loginStationInfo = e.data; // this.loginStationInfo = e.data;
//TODO //TODO
// this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"} this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"}
this.getProductPlans(); this.getProductPlans();
this.getChartData(); this.getChartData();
}); });
@ -1620,7 +1620,7 @@ export default {
this.PrintData.barcodeType = this.BARCODE_TYPE.SPLIT_BARCODE;//拆分后配对码 this.PrintData.barcodeType = this.BARCODE_TYPE.SPLIT_BARCODE;//拆分后配对码
this.printModel = true this.printModel = true
}); });
ge
}); });
}, },

2
hw-ui/src/views/board/firstFloor/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="headTitle">京源环保生产管理系统</div> <div class="headTitle">京源环保MOM生产管理系统</div>
<div class="chartBox chartBox1"> <div class="chartBox chartBox1">
<div class="title">生产派工</div> <div class="title">生产派工</div>

2
hw-ui/src/views/board/fourthFloor/assemble.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="headTitle">京源环保生产管理系统</div> <div class="headTitle">京源环保MOM生产管理系统</div>
<div class="chartBox chartBox1"> <div class="chartBox chartBox1">
<div class="title">生产派工</div> <div class="title">生产派工</div>

2
hw-ui/src/views/board/fourthFloor/laserLight.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="headTitle">京源环保生产管理系统</div> <div class="headTitle">京源环保MOM生产管理系统</div>
<div class="chartBox chartBox1"> <div class="chartBox chartBox1">
<div class="title">生产明细</div> <div class="title">生产明细</div>

2
hw-ui/src/views/board/fourthFloor/weld.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="headTitle">京源环保生产管理系统</div> <div class="headTitle">京源环保MOM生产管理系统</div>
<div class="chartBox chartBox1"> <div class="chartBox chartBox1">
<div class="title">生产明细</div> <div class="title">生产明细</div>

8
hw-ui/src/views/login.vue
Unescape Escape View File

@ -1,8 +1,8 @@
<template> <template>
<div class="login" :style="`background-image: url(${!isStationId?loginBg1:loginBg2});`"> <div class="login" :style="`background-image: url(${!isStationId?loginBg1:loginBg2});`">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title" v-if="!isStationId">京源环保MES系统</h3> <h3 class="title" v-if="!isStationId">京源环保MOM管理系统</h3>
<h3 class="title" v-else>京源环保车间MES系统</h3> <h3 class="title" v-else>京源环保MOM车间系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
@ -87,8 +87,8 @@ export default {
loginBg2, loginBg2,
codeUrl: '', codeUrl: '',
loginForm: { loginForm: {
username: 'xin', username: '',
password: '123456', password: '',
rememberMe: false, rememberMe: false,
processId: '', processId: '',
processFloor: '', processFloor: '',

6
hw-ui/src/views/login2.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">京源环保管理系统</h3> <h3 class="title">京源环保MOM管理系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
@ -72,8 +72,8 @@ export default {
return { return {
codeUrl: "", codeUrl: "",
loginForm: { loginForm: {
username: "admin", username: "",
password: "admin123", password: "",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "" uuid: ""

2
hw-ui/src/views/mes/barcode/index.vue
Unescape Escape View File

@ -27,7 +27,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编号" prop="materialCode"> <el-form-item label="物料编码" prop="materialCode">
<el-input <el-input
v-model="queryParams.materialCode" v-model="queryParams.materialCode"
placeholder="请输入物料编码" placeholder="请输入物料编码"

2
hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
Unescape Escape View File

@ -17,7 +17,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<el-form-item label="销售物料编号" prop="materialCode"> <el-form-item label="销售物料编码" prop="materialCode">
<el-input v-model="saleOrderForm.materialCode" disabled/> <el-input v-model="saleOrderForm.materialCode" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
hw-ui/src/views/wms/common/applyRawOutstock.vue
Unescape Escape View File

@ -22,7 +22,7 @@
style="width: 100%;overflow-x: auto" style="width: 100%;overflow-x: auto"
> >
<el-table-column <el-table-column
label="物料编号" label="物料编码"
prop="materialCode" prop="materialCode"
> >
</el-table-column> </el-table-column>

2
hw-ui/src/views/wms/info/move/detail.vue
Unescape Escape View File

@ -62,7 +62,7 @@
@selection-change="handleWmsMoveDetailSelectionChange" ref="wmsMoveDetail"> @selection-change="handleWmsMoveDetailSelectionChange" ref="wmsMoveDetail">
<el-table-column label="序号" align="center" prop="index" width="50"/> <el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="物料条码" align="center" prop="materialBarcode" /> <el-table-column label="物料条码" align="center" prop="materialBarcode" />
<el-table-column label="物料编号" align="center" prop="materialCode" /> <el-table-column label="物料编码" align="center" prop="materialCode" />
<el-table-column label="物料名称" align="center" prop="materialName" /> <el-table-column label="物料名称" align="center" prop="materialName" />
<el-table-column label="单位" align="center" prop="unitName" /> <el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="计划数量" align="center" prop="planAmount" /> <el-table-column label="计划数量" align="center" prop="planAmount" />

6
hw-ui/src/views/wms/info/rawOutstockDetail/index.vue
Unescape Escape View File

@ -141,7 +141,7 @@
<el-table-column label="库位编码" align="center" prop="locationCode" width="120" v-if="columns[4].visible"/> <el-table-column label="库位编码" align="center" prop="locationCode" width="120" v-if="columns[4].visible"/>
<el-table-column label="物料条码" align="center" prop="materialBarcode" width="160" v-if="columns[5].visible"/> <el-table-column label="物料条码" align="center" prop="materialBarcode" width="160" v-if="columns[5].visible"/>
<el-table-column label="物料ID" align="center" prop="materialId" width="80" v-if="columns[6].visible"/> <el-table-column label="物料ID" align="center" prop="materialId" width="80" v-if="columns[6].visible"/>
<el-table-column label="物料编号" align="center" prop="materialCode" width="120" v-if="columns[29].visible"/> <el-table-column label="物料编码" align="center" prop="materialCode" width="120" v-if="columns[29].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="120" v-if="columns[30].visible"/> <el-table-column label="物料名称" align="center" prop="materialName" width="120" v-if="columns[30].visible"/>
<el-table-column label="批次" align="center" prop="instockBatch" width="120" v-if="columns[7].visible"/> <el-table-column label="批次" align="center" prop="instockBatch" width="120" v-if="columns[7].visible"/>
<el-table-column label="生产日期" align="center" prop="materialProductionDate" <el-table-column label="生产日期" align="center" prop="materialProductionDate"
@ -372,7 +372,7 @@
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="8"><b>任务编号：</b><span style="color:#333">{{ relateSaleOrderForm.taskCode || getCurrentDetail('taskCode') }}</span></el-col> <el-col :span="8"><b>任务编号：</b><span style="color:#333">{{ relateSaleOrderForm.taskCode || getCurrentDetail('taskCode') }}</span></el-col>
<el-col :span="8"><b>计划编号：</b><span style="color:#333">{{ relateSaleOrderForm.planCode || getCurrentDetail('planCode') }}</span></el-col> <el-col :span="8"><b>计划编号：</b><span style="color:#333">{{ relateSaleOrderForm.planCode || getCurrentDetail('planCode') }}</span></el-col>
<el-col :span="8"><b>物料编号：</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col> <el-col :span="8"><b>物料编码：</b><span style="color:#333">{{ relateSaleOrderForm.materialCode || getCurrentDetail('materialCode') }}</span></el-col>
</el-row> </el-row>
<el-row :gutter="16" style="margin-top: 8px;"> <el-row :gutter="16" style="margin-top: 8px;">
<el-col :span="8"><b>物料名称：</b><span style="color:#333">{{ relateSaleOrderForm.materialName || getCurrentDetail('materialName') }}</span></el-col> <el-col :span="8"><b>物料名称：</b><span style="color:#333">{{ relateSaleOrderForm.materialName || getCurrentDetail('materialName') }}</span></el-col>
@ -565,7 +565,7 @@ export default {
{key: 26, label: `计划编号`, visible: true}, {key: 26, label: `计划编号`, visible: true},
{key: 27, label: `计划明细编号`, visible: true}, {key: 27, label: `计划明细编号`, visible: true},
{key: 28, label: `销售订单编号`, visible: true}, {key: 28, label: `销售订单编号`, visible: true},
{key: 29, label: `物料编号`, visible: true}, {key: 29, label: `物料编码`, visible: true},
{key: 30, label: `物料名称`, visible: true}, {key: 30, label: `物料名称`, visible: true},
], ],
relateSaleOrderDialogVisible: false, relateSaleOrderDialogVisible: false,

Write Preview
Loading…
Cancel
Save