opt:1.优化单据回传查询;2.优化用料单实时查询,实时更新;
3.优化失败单据回传字段序列化顺序混乱; 4.手动同步数量限制,模糊搜索; 5.异常单据处理,标记完成;
This commit is contained in:
@@ -153,8 +153,8 @@ public class ErpServiceUtils {
|
|||||||
//执行回传
|
//执行回传
|
||||||
try {
|
try {
|
||||||
String json = from.toJSONString();
|
String json = from.toJSONString();
|
||||||
result = getCloudApi().audit(from.getString("formid"), json);
|
// result = getCloudApi().audit(from.getString("formid"), json);
|
||||||
from.put("result", result);
|
// from.put("result", result);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.error(ex.getMessage());
|
Log.error(ex.getMessage());
|
||||||
from.put("result", ex.getMessage());
|
from.put("result", ex.getMessage());
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public class BmFormStrucController {
|
|||||||
@GetMapping("/getParentFormTypes/{desc}")
|
@GetMapping("/getParentFormTypes/{desc}")
|
||||||
public ResponseEntity<Object> getParentFormTypes(@PathVariable String desc){
|
public ResponseEntity<Object> getParentFormTypes(@PathVariable String desc){
|
||||||
//参数判读,参数解析,调用参数入库
|
//参数判读,参数解析,调用参数入库
|
||||||
QueryWrapper<BmFormStruc> queryWrapper = new QueryWrapper<BmFormStruc>().select("form_type", "form_name").isNull("parent_id").groupBy("form_type");
|
QueryWrapper<BmFormStruc> queryWrapper = new QueryWrapper<BmFormStruc>().select("form_type", "form_name").isNull("parent_id").groupBy("form_type").orderByAsc("sort");
|
||||||
if (StringUtils.isNotEmpty(desc)){
|
if (StringUtils.isNotEmpty(desc)){
|
||||||
queryWrapper.like("form_desc",desc);
|
queryWrapper.like("form_desc",desc);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,5 +154,8 @@ public class BmFormStruc implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String bar_code;
|
private String bar_code;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 条码
|
||||||
|
*/
|
||||||
|
private String sort;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,27 +78,26 @@
|
|||||||
<el-table-column type="selection" width="55" />
|
<el-table-column type="selection" width="55" />
|
||||||
<el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
|
<el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
|
<el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
|
|
||||||
<el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
|
|
||||||
<el-table-column prop="growth" label="是否增加库存" width="150" show-tooltip-when-overflow>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
{{ scope.row.growth }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
|
<el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
|
<el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
|
<el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow />
|
<el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow />
|
||||||
<el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow />
|
<el-table-column prop="growth" label="变动类型" width="150" show-tooltip-when-overflow>
|
||||||
<el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow />
|
<template slot-scope="scope">
|
||||||
<el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow />
|
{{ scope.row.growth === true ? '入库' : '出库' }}
|
||||||
<el-table-column prop="source_form_id" label="单据表名" min-width="120" show-tooltip-when-overflow />
|
</template>
|
||||||
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="变动类型">
|
</el-table-column>
|
||||||
|
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="业务类型" width="110">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
|
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow />
|
<el-table-column prop="update_time" label="修改时间" width="140" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow />
|
||||||
|
|
||||||
<!-- <el-table-column-->
|
<!-- <el-table-column-->
|
||||||
<!-- label="操作"-->
|
<!-- label="操作"-->
|
||||||
|
|||||||
@@ -46,12 +46,12 @@
|
|||||||
class="filter-item"
|
class="filter-item"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="批号">
|
<el-form-item label="批次">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="query.pcsn"
|
v-model="query.pcsn"
|
||||||
clearable
|
clearable
|
||||||
size="mini"
|
size="mini"
|
||||||
placeholder="请输入批号"
|
placeholder="请输入批次"
|
||||||
prefix-icon="el-icon-search"
|
prefix-icon="el-icon-search"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user