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

取消计量单位

Browse Source
This commit is contained in:
张江玮
2022-12-17 09:45:45 +08:00
parent 4459fdf57a
commit 9065015d95
3 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
// 进行计量单位与物料的更新
JSONArray data = response_body.getJSONArray("data");
WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit");
// WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit");
WQLObject material_table = WQLObject.getWQLObject("md_me_materialbase");
Long user_id = SecurityUtils.getCurrentUserId();
String nick_name = SecurityUtils.getCurrentNickName();
@@ -216,27 +216,28 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
for (Object o : data) {
JSONObject material = (JSONObject) o;
// 计量单位不管
// 查询是否存在这个计量单位
String unit_code = material.getString("unit_code");
JSONObject unit = unit_table
.query("unit_code = '" + unit_code + "'")
.uniqueResult(0);
if (ObjectUtil.isEmpty(unit)) {
// String unit_code = material.getString("unit_code");
// JSONObject unit = unit_table
// .query("unit_code = '" + unit_code + "'")
// .uniqueResult(0);
// if (ObjectUtil.isEmpty(unit)) {
// 如果不存在则添加
material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L));
material.put("is_used", "1");
material.put("create_id", user_id);
material.put("create_name", nick_name);
material.put("create_time", now);
unit_table.insert(material);
} else {
// material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L));
// material.put("is_used", "1");
// material.put("create_id", user_id);
// material.put("create_name", nick_name);
// material.put("create_time", now);
// unit_table.insert(material);
// } else {
// 如果存在则修改
unit.put("unit_name", material.getString("unit_name"));
unit.put("update_optid", user_id);
unit.put("update_optname", nick_name);
unit.put("update_time", now);
unit_table.update(unit);
}
// unit.put("unit_name", material.getString("unit_name"));
// unit.put("update_optid", user_id);
// unit.put("update_optname", nick_name);
// unit.put("update_time", now);
// unit_table.update(unit);
// }
// 查询是否存在这个物料
String material_code = material.getString("material_code");
@@ -254,7 +255,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
} else {
// 如果存在则修改
existMaterial.put("material_name", material.getString("material_name"));
existMaterial.put("unit_code", unit_code);
// existMaterial.put("unit_code", unit_code);
existMaterial.put("update_optid", user_id);
existMaterial.put("update_optname", nick_name);
existMaterial.put("update_time", now);

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.

15
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -58,14 +58,14 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
</el-form-item>
@@ -79,7 +79,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="false">
<el-col>
<el-form-item label="计量单位" prop="unit_code">
<el-select
@@ -162,12 +162,12 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="200" />
<el-table-column prop="material_name" label="物料名称" width="200" show-overflow-tooltip />
<el-table-column v-if="false" prop="material_spec" label="物料规格" width="140" />
<el-table-column v-if="false" prop="material_model" label="物料型号" />
<el-table-column v-if="false" prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column v-if="false" prop="unit_name" label="计量单位" />
<el-table-column v-if="false" prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column v-if="false" prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
@@ -326,9 +326,6 @@ export default {
],
material_height_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
unit_code: [
{ required: true, message: '计量单位不能为空', trigger: 'blur' }
]
}
}