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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-02-05 18:41:53 +08:00
parent 7f51a4e3e9
commit 2e8e9be3de
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
View File

@@ -124,6 +124,9 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
if(StrUtil.equals(task.getTask_type(),"7") && StrUtil.equals(task.getStorage_task_type(),"4")){ if(StrUtil.equals(task.getTask_type(),"7") && StrUtil.equals(task.getStorage_task_type(),"4")){
inst.setInstruction_status("2"); inst.setInstruction_status("2");
instructionService.finish(inst.getInstruction_id()); instructionService.finish(inst.getInstruction_id());
} else {
inst.setRemark("立库已反馈完成，待输送上报任务号");
instructionService.update(inst);
} }
} else if(StrUtil.equals(status,"4")){ } else if(StrUtil.equals(status,"4")){

4
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -157,8 +157,8 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_inst_data" width="200" label="复合路线" />-->
<el-table-column prop="matarial" label="物料" /> <!-- <el-table-column prop="matarial" label="物料" />-->
<el-table-column prop="quantity" label="数量" /> <!-- <el-table-column prop="quantity" label="数量" />-->
<el-table-column prop="remark" label="描述" /> <el-table-column prop="remark" label="描述" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />

4
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -353,8 +353,8 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />--> <!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
<el-table-column prop="matarial" label="物料" /> <!-- <el-table-column prop="matarial" label="物料" />-->
<el-table-column prop="quantity" label="数量" /> <!-- <el-table-column prop="quantity" label="数量" />-->
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" /> <el-table-column prop="create_time" label="创建时间" width="135" />