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

rev:修改dtlSplit判断

Browse Source
This commit is contained in:
zhangzq
2024-11-20 13:24:00 +08:00
parent 82c1b57f29
commit 6d4e264b3b
10 changed files with 100 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
View File

@@ -24,7 +24,9 @@ public class DictConstantPool {
,"biz_status","业务单据状态"
,"biz_form_type","业务单据类型"
,"material_id","物料id"
,"qty","数量"
,"qty","申请数量"
,"plan_qty","计划数量"
,"assign_qty","已领数量"
,"unit_id","单位"
,"pcsn","批次"
,"vehicle_code","载具");

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
View File

@@ -98,10 +98,18 @@ public class BmFormStruc implements Serializable {
private String vehicle_id;
/**
* 数量
* 申请数量（必须有）
*/
private String qty;
/**
* 计划数量
*/
private String plan_qty;
/**
* 已领取数量
*/
private String assign_qty;
/**
* 单位id
*/

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java
View File

@@ -7,6 +7,7 @@ import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.MapOf;
import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -49,13 +51,13 @@ public class PdaOutController {
@GetMapping("order")
@Log("出库单据列表")
@SaIgnore
public ResponseEntity<List<LabelValueVo>> orderType() {
List<LabelValueVo> result = new ArrayList<>();
public ResponseEntity<List<Map>> orderType() {
List<Map> result = new ArrayList<>();
List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()
.likeRight("form_desc","出库")
.select("form_type","form_name"));
for (BmFormStruc formStruc : list) {
result.add(new LabelValueVo(formStruc.getForm_name(), formStruc.getForm_type()));
result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type()));
}
return new ResponseEntity<>(result,HttpStatus.OK);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -37,8 +37,6 @@ public class PmFormDataController {
@GetMapping()
@Log("查询数据")
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -78,7 +78,11 @@ public class PmFormData implements Serializable {
*/
private BigDecimal qty;
/**
* 分配数量
* 数量
*/
private BigDecimal plan_qty;
/**
* 已分配数量
*/
private BigDecimal assign_qty;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -36,6 +36,8 @@
<result property="create_time" column="create_time"/>
<result property="material_id" column="material_id"/>
<result property="qty" column="qty"/>
<result property="assign_qty" column="assign_qty"/>
<result property="plan_qty" column="plan_qty"/>
<result property="pcsn" column="pcsn"/>
<result property="material_code" column="material_code"/>
<result property="material_name" column="material_name"/>

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
View File

@@ -104,7 +104,11 @@ public class PmFormDataDto implements Serializable {
*/
private BigDecimal qty;
/**
* 分配数量
* 数量
*/
private BigDecimal plan_qty;
/**
* 已分配数量
*/
private BigDecimal assign_qty;

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -128,7 +128,6 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
}
}
}
return result;
}
@@ -162,7 +161,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
@Override
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
page.setOrderBy("id DESC");
List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree(query);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
@@ -232,7 +231,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
formMap.put(item.getString("value"), item);
}, HashMap::putAll);
//基础字段
Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty());
Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty(),formStruc.getPlan_qty(),formStruc.getAssign_qty());
JSONObject data = fieldMapping(fields, fieldMapping, sourceData);
data.put("form_type",formStruc.getForm_type());

2
wms_pro/qd/src/views/login.vue
View File

@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title">
恒森WMS系统
仓库综合管理平台
</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

120
wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
View File

@@ -19,21 +19,21 @@
filterable
size="mini"
class="filter-item"
style="width: 185px;">
style="width: 185px;"
>
<el-option
v-for="item in form_types"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
</crudOperation>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -46,26 +46,26 @@
<el-row>
<el-col :span="12">
<el-form-item label="表单类型" prop="form_type">
<el-input v-model="form.form_type" style="width: 150px;"/>
<el-input v-model="form.form_type" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表单名称" prop="form_name">
<el-input v-model="form.form_name" style="width: 150px;"/>
<el-input v-model="form.form_name" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="表单描述" prop="form_desc">
<el-input type="textarea" v-model="form.form_desc" style="width: 430px;"/>
<el-input v-model="form.form_desc" type="textarea" style="width: 430px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="数据映射字段" prop="convert_json">
<el-input type="textarea" v-model="form.convert_json" style="width: 430px;"/>
<el-input v-model="form.convert_json" type="textarea" style="width: 430px;" />
</el-form-item>
</el-col>
</el-row>
@@ -90,8 +90,8 @@
<el-col :span="12">
<el-form-item label="是否含有子表" prop="has_child">
<el-radio-group v-model="form.has_child" style="width: 140px">
<el-radio :label='true'>是</el-radio>
<el-radio :label='false'>否</el-radio>
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -100,74 +100,86 @@
<el-col :span="12">
<el-form-item label="是否基础表" prop="has_child">
<el-radio-group v-model="form.is_base" style="width: 140px">
<el-radio :label='true'>是</el-radio>
<el-radio :label='false'>否</el-radio>
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务表id映射" prop="biz_id">
<el-input v-model="form.biz_id" style="width: 150px;"/>
<el-input v-model="form.biz_id" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务表编码映射" prop="biz_code">
<el-input v-model="form.biz_code" style="width: 150px;"/>
<el-input v-model="form.biz_code" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务表时间映射" prop="bus_data">
<el-input v-model="form.biz_date" style="width: 150px;"/>
<el-input v-model="form.biz_date" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务表状态映射" prop="biz_status">
<el-input v-model="form.biz_status" style="width: 150px;"/>
<el-input v-model="form.biz_status" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务表单据类型映射" prop="bus_data">
<el-input v-model="form.biz_form_type" style="width: 150px;"/>
<el-input v-model="form.biz_form_type" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料id映射" prop="material_id">
<el-input v-model="form.material_id" style="width: 150px;"/>
<el-input v-model="form.material_id" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料数量映射" prop="qty">
<el-input v-model="form.qty" style="width: 150px;"/>
<el-form-item label="物料需求数量" prop="qty">
<el-input v-model="form.qty" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划数量" prop="material_id">
<el-input v-model="form.plan_qty" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已分配数量" prop="qty">
<el-input v-model="form.assign_qty" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料单位" prop="pcsn">
<el-input v-model="form.unit_id" style="width: 150px;"/>
<el-input v-model="form.unit_id" style="width: 150px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料批次映射" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 150px;"/>
<el-input v-model="form.pcsn" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 150px;"/>
<el-input v-model="form.vehicle_code" style="width: 150px;" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="自定义字段" prop="form_param">
<el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" style="width: 430px;"/>
<el-input v-model="form.form_param" type="textarea" :formatter="jsonFormat" style="width: 430px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -186,26 +198,28 @@
row-key="form_type"
table-layout="auto"
>
<el-table-column type="selection"/>
<el-table-column prop="form_type" show-overflow-tooltip width="150" label="表单类型"/>
<el-table-column prop="form_name" show-overflow-tooltip width="120" label="表单名称"/>
<el-table-column prop="form_desc" show-overflow-tooltip width="120" label="描述"/>
<el-table-column prop="convert_json" show-overflow-tooltip width="120" label="数据映射字段"/>
<el-table-column prop="has_child" show-overflow-tooltip width="120" :formatter="booleanFormat" label="是否关联子表"/>
<el-table-column prop="is_base" show-overflow-tooltip width="120" :formatter="booleanFormat" label="属于基础表"/>
<el-table-column type="selection" />
<el-table-column prop="form_type" show-overflow-tooltip width="150" label="表单类型" />
<el-table-column prop="form_name" show-overflow-tooltip width="120" label="表单名称" />
<el-table-column prop="form_desc" show-overflow-tooltip width="120" label="描述" />
<el-table-column prop="convert_json" show-overflow-tooltip width="120" label="数据映射字段" />
<el-table-column prop="has_child" show-overflow-tooltip width="120" :formatter="booleanFormat" label="是否关联子表" />
<el-table-column prop="is_base" show-overflow-tooltip width="120" :formatter="booleanFormat" label="属于基础表" />
<!-- <el-table-column prop="parent_id" show-overflow-tooltip width="120" label="父表id"/>-->
<el-table-column prop="biz_id" show-overflow-tooltip width="120" label="业务单据id映射"/>
<el-table-column prop="biz_code" show-overflow-tooltip width="130" label="业务单据code映射"/>
<el-table-column prop="biz_form_type" show-overflow-tooltip width="130" label="业务单据type映射"/>
<el-table-column prop="biz_date" show-overflow-tooltip width="130" label="业务单据时间映射"/>
<el-table-column prop="biz_status" show-overflow-tooltip width="130" label="业务单据状态映射"/>
<el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射"/>
<el-table-column prop="qty" show-overflow-tooltip width="120" label="物料数量映射"/>
<el-table-column prop="pcsn" show-overflow-tooltip width="120" label="物料批次映射"/>
<el-table-column prop="vehicle_code" show-overflow-tooltip width="120" label="载具编号"/>
<el-table-column prop="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射"/>
<el-table-column prop="update_time" show-overflow-tooltip width="150" label="更新时间"/>
<el-table-column prop="update_name" show-overflow-tooltip width="150" label="更新人"/>
<el-table-column prop="biz_id" show-overflow-tooltip width="120" label="业务单据id映射" />
<el-table-column prop="biz_code" show-overflow-tooltip width="130" label="业务单据code映射" />
<el-table-column prop="biz_form_type" show-overflow-tooltip width="130" label="业务单据type映射" />
<el-table-column prop="biz_date" show-overflow-tooltip width="130" label="业务单据时间映射" />
<el-table-column prop="biz_status" show-overflow-tooltip width="130" label="业务单据状态映射" />
<el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射" />
<el-table-column prop="qty" show-overflow-tooltip width="120" label="申请数量" />
<el-table-column prop="plan_qty" show-overflow-tooltip width="120" label="计划数量" />
<el-table-column prop="assign_qty" show-overflow-tooltip width="120" label="已分配数量" />
<el-table-column prop="pcsn" show-overflow-tooltip width="120" label="批次" />
<el-table-column prop="vehicle_code" show-overflow-tooltip width="120" label="载具编号" />
<el-table-column prop="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射" />
<el-table-column prop="update_time" show-overflow-tooltip width="150" label="更新时间" />
<el-table-column prop="update_name" show-overflow-tooltip width="150" label="更新人" />
<el-table-column
label="操作"
width="120px"
@@ -225,9 +239,9 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
</div>
</template>
@@ -255,6 +269,8 @@ const defaultForm = {
biz_form_type: null,
material_id: null,
qty: null,
plan_qty: null,
assign_qty: null,
pcsn: null,
vehicle_code: null,
form_param: null,
@@ -268,7 +284,7 @@ export default {
name: 'FormStruc',
dicts: ['base_data'],
components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [ presenter(), header(), form(defaultForm), crud() ],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '自定义表单',
@@ -290,10 +306,10 @@ export default {
permission: {},
rules: {
form_type: [
{required: true, message: '表单类型不能为空', trigger: 'blur'}
{ required: true, message: '表单类型不能为空', trigger: 'blur' }
],
form_name: [
{required: true, message: '表单名称不能为空', trigger: 'blur'}
{ required: true, message: '表单名称不能为空', trigger: 'blur' }
]
}
}
@@ -310,7 +326,7 @@ export default {
return true
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.form_param){
if (this.form.form_param) {
this.form.form_param = JSON.parse(this.form.form_param)
}
return true
@@ -326,7 +342,7 @@ export default {
}, 100)
},
booleanFormat(row, column, cellValue) {
return cellValue ? '是' : '否';
return cellValue ? '是' : '否'
},
jsonFormat(row, index) {
if (row.form_param != null) {