root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复设备修改重复code的BUG以及工序的添加

Browse Source
This commit is contained in:
liyongde
2023-03-31 09:57:51 +08:00
parent 08d7d1acdb
commit 0646a9d6ee
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
View File

@@ -148,6 +148,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
String currentUserId = SecurityUtils.getCurrentUserId(); String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName(); String nickName = SecurityUtils.getCurrentNickName();
dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
dto.setCurrent_produce_person_id(currentUserId);
dto.setCreate_id(currentUserId); dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName); dto.setCreate_name(nickName);
dto.setUpdate_id(currentUserId); dto.setUpdate_id(currentUserId);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
View File

@@ -100,7 +100,7 @@ public class DeviceServiceImpl implements DeviceService {
String where = "is_delete = '0' and device_code = '" + dto.getDevice_code() + "'"; String where = "is_delete = '0' and device_code = '" + dto.getDevice_code() + "'";
JSONObject jsonObject = wo.query(where).uniqueResult(0); JSONObject jsonObject = wo.query(where).uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonObject)) { if (ObjectUtil.isNotEmpty(jsonObject) && !dto.getDevice_code().equals(jsonObject.getString("device_code"))) {
throw new BadRequestException("编码已存在!"); throw new BadRequestException("编码已存在!");
} }

2
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -360,7 +360,7 @@
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }} {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="workprocedure_code" label="工序编码" /> <!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产区域" /> <el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="plan_qty" label="计划数量" /> <el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" /> <el-table-column prop="real_qty" label="实际数量" />

10
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -110,6 +110,16 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属工序">
<el-select v-model="form.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 200px" @change="changeHeader(query.search, query.workprocedure_id)">
<el-option
v-for="item in workList"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</el-form-item>
<el-form-item label="设备编码2"> <el-form-item label="设备编码2">
<el-input v-model="form.device_code2" style="width: 200px;" /> <el-input v-model="form.device_code2" style="width: 200px;" />
</el-form-item> </el-form-item>