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

更新

Browse Source
This commit is contained in:
张江玮
2023-04-24 10:08:53 +08:00
parent b4521db5dc
commit 2aebd92ad6
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,9 +105,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
dto.setCreate_id(currentUserId); dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName); dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId); dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json); wo.insert(json);

14
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -109,6 +109,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="material_code"> <el-form-item label="物料编码" prop="material_code">
<el-input <el-input
:disabled="crud.status.edit"
v-model="form.material_code" v-model="form.material_code"
style="width: 300px" style="width: 300px"
clearable clearable
@@ -122,6 +123,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生产设备" prop="device_name"> <el-form-item label="生产设备" prop="device_name">
<el-input <el-input
:disabled="crud.status.edit"
v-model="form.device_name" v-model="form.device_name"
style="width: 300px" style="width: 300px"
clearable clearable
@@ -134,14 +136,14 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="计划数量/重量" prop="plan_qty"> <el-form-item label="计划数量/重量" prop="plan_qty">
<el-input v-model="form.plan_qty" type="number" style="width: 300px" /> <el-input :disabled="crud.status.edit" v-model="form.plan_qty" type="number" style="width: 300px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type"> <el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择"> <el-select :disabled="crud.status.edit" v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
<el-option <el-option
v-for="item in dict.wood_vehicle_type" v-for="item in dict.wood_vehicle_type"
:key="item.id" :key="item.id"
@@ -155,16 +157,16 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否加急" prop="is_urgent"> <el-form-item label="是否加急" prop="is_urgent">
<el-radio v-model="form.is_urgent" label="1">是</el-radio> <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="1">是</el-radio>
<el-radio v-model="form.is_urgent" label="0">否</el-radio> <el-radio :disabled="crud.status.edit" v-model="form.is_urgent" label="0">否</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否优先包装" prop="is_pri"> <el-form-item label="是否优先包装" prop="is_pri">
<el-radio v-model="form.is_pri" label="1">是</el-radio> <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="1">是</el-radio>
<el-radio v-model="form.is_pri" label="0">否</el-radio> <el-radio :disabled="crud.status.edit" v-model="form.is_pri" label="0">否</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>