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

更新

Browse Source
This commit is contained in:
loujf
2022-10-14 16:54:42 +08:00
parent 10dbfe7190
commit 75e41319fd
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -318,7 +318,7 @@ public class CallMaterialTask extends AbstractAcsTask {
param.put("is_full", is_full); param.put("is_full", is_full);
param.put("group_device", group_device); param.put("group_device", group_device);
JSONObject outStructObj = StructFindUtil.getOutStruct(param); JSONObject outStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(outStructObj)) { if (ObjectUtil.isEmpty(outStructObj) && !StrUtil.equals(ivt_workprocedure_id,WorkProcedureEnum.YZGX.getId())) {
//假如没有货，且下料位两个都为空下发acs动作信号 //假如没有货，且下料位两个都为空下发acs动作信号
WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl(); WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();

8
wms/qd/src/views/wms/database/material/index.vue
View File

@@ -28,7 +28,7 @@
<el-form-item label="物料编码" prop="material_code"> <el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 370px;" /> <el-input v-model="form.material_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="material_name"> <el-form-item label="产品名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 370px;" /> <el-input v-model="form.material_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="规格"> <el-form-item label="规格">
@@ -72,11 +72,11 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="material_code" label="物料编码" /> <el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称 " /> <el-table-column prop="material_name" label="产品名称 " />
<el-table-column prop="material_spec" label="规格" /> <el-table-column prop="material_spec" label="规格" />
<el-table-column prop="material_model" label="型号" /> <el-table-column prop="material_model" label="型号" />
<el-table-column prop="material_type" label="物料类型" /> <el-table-column prop="material_type" label="物料类型" />
<el-table-column prop="stewing_time" label="静止时间(分钟)" width="110" /> <el-table-column prop="stewing_time" label="静止时间(小时)" width="110" />
<el-table-column prop="english_name" label="外文名称" /> <el-table-column prop="english_name" label="外文名称" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" /> <el-table-column prop="create_time" label="创建时间" width="150" />
@@ -274,7 +274,7 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery() this.crud.toQuery()
}) })
}, }
} }
} }
</script> </script>

8
wms/qd/src/views/wms/pdm/produceTask/index.vue
View File

@@ -182,10 +182,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="生产顺序" prop="seq_no"> <!-- <el-form-item label="生产顺序" prop="seq_no">-->
<el-input-number v-model="form.seq_no" controls-position="right" style="width: 200px;text-align: left" :min="1" /> <!-- <el-input-number v-model="form.seq_no" controls-position="right" style="width: 200px;text-align: left" :min="1" />-->
<!-- <el-input-number v-model="form.seq_no" :precision="0" :step="10" :min="0" style="width: 200px;" />--> <!-- &lt;!&ndash; <el-input-number v-model="form.seq_no" :precision="0" :step="10" :min="0" style="width: 200px;" />&ndash;&gt;-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="false" label="静置时间" prop="stewing_time"> <el-form-item v-if="false" label="静置时间" prop="stewing_time">
<el-input v-model="form.stewing_time" :rows="3" style="width: 200px;" /> <el-input v-model="form.stewing_time" :rows="3" style="width: 200px;" />
</el-form-item> </el-form-item>