diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
new file mode 100644
index 0000000..e6edb09
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
@@ -0,0 +1,341 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="货主">
+ <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="库区">
+ <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="容器状态">
+ <j-dict-select-tag placeholder="请选择容器状态" v-model="queryParam.containerStatus" dictCode="container_status"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="容器编码">
+ <a-input placeholder="请输入容器编码" v-model="queryParam.containerCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="库位编码">
+ <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料编码">
+ <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料名称">
+ <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料规格">
+ <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料单位">
+ <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="库存状态">
+ <j-dict-select-tag placeholder="请选择库存状态" v-model="queryParam.inventoryStatus" dictCode="inventory_status"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="库龄（天）">
+ <a-input placeholder="请输入库龄（天）" v-model="queryParam.inventoryAge"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="唯一号">
+ <a-input placeholder="请输入唯一号" v-model="queryParam.uniqueCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="10" :lg="11" :md="12" :sm="24">
+ <a-form-item label="创建日期">
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+ <span class="query-group-split-cust"></span>
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+ </a-form-item>
+ </a-col>
+ </template>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 查询区域-END -->
+
+ <!-- 操作按钮区域 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('库存明细')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ <!-- 高级查询区域 -->
+ <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+ <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 下载
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">编辑</a>
+
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">详情</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+
+ <inventory-child-modal ref="modalForm" @ok="modalFormOk"></inventory-child-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import InventoryChildModal from './modules/InventoryChildModal'
+ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+ export default {
+ name: 'InventoryChildList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ InventoryChildModal
+ },
+ data () {
+ return {
+ description: '库存明细管理页面',
+ // 表头
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'货主',
+ align:"center",
+ dataIndex: 'companyCode'
+ },
+ {
+ title:'库区',
+ align:"center",
+ dataIndex: 'zoneCode'
+ },
+ {
+ title:'容器状态',
+ align:"center",
+ dataIndex: 'containerStatus_dictText'
+ },
+ {
+ title:'容器编码',
+ align:"center",
+ dataIndex: 'containerCode'
+ },
+ {
+ title:'库位编码',
+ align:"center",
+ dataIndex: 'locationCode'
+ },
+ {
+ title:'物料编码',
+ align:"center",
+ dataIndex: 'materialCode'
+ },
+ {
+ title:'物料名称',
+ align:"center",
+ dataIndex: 'materialName'
+ },
+ {
+ title:'物料规格',
+ align:"center",
+ dataIndex: 'materialSpec'
+ },
+ {
+ title:'物料单位',
+ align:"center",
+ dataIndex: 'materialUnit'
+ },
+ {
+ title:'库存状态',
+ align:"center",
+ dataIndex: 'inventoryStatus_dictText'
+ },
+ {
+ title:'库龄（天）',
+ align:"center",
+ dataIndex: 'inventoryAge'
+ },
+ {
+ title:'唯一号',
+ align:"center",
+ dataIndex: 'uniqueCode'
+ },
+ {
+ title:'创建人',
+ align:"center",
+ dataIndex: 'createBy'
+ },
+ {
+ title:'创建日期',
+ align:"center",
+ dataIndex: 'createTime'
+ },
+ {
+ title:'更新人',
+ align:"center",
+ dataIndex: 'updateBy'
+ },
+ {
+ title:'更新日期',
+ align:"center",
+ dataIndex: 'updateTime'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/inventory/inventoryChild/list",
+ delete: "/inventory/inventoryChild/delete",
+ deleteBatch: "/inventory/inventoryChild/deleteBatch",
+ exportXlsUrl: "/inventory/inventoryChild/exportXls",
+ importExcelUrl: "inventory/inventoryChild/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
+ fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
+ fieldList.push({type:'string',value:'containerStatus',text:'容器状态',dictCode:'container_status'})
+ fieldList.push({type:'string',value:'containerCode',text:'容器编码',dictCode:''})
+ fieldList.push({type:'string',value:'locationCode',text:'库位编码',dictCode:''})
+ fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
+ fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
+ fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
+ fieldList.push({type:'string',value:'materialUnit',text:'物料单位',dictCode:''})
+ fieldList.push({type:'string',value:'inventoryStatus',text:'库存状态',dictCode:'inventory_status'})
+ fieldList.push({type:'int',value:'inventoryAge',text:'库龄（天）',dictCode:''})
+ fieldList.push({type:'string',value:'uniqueCode',text:'唯一号',dictCode:''})
+ fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+ fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+ fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+ fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue
new file mode 100644
index 0000000..511e158
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildForm.vue
@@ -0,0 +1,168 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
+ <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zoneCode">
+ <a-input v-model="model.zoneCode" placeholder="请输入库区" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="容器状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="containerStatus">
+ <j-dict-select-tag type="list" v-model="model.containerStatus" dictCode="container_status" placeholder="请选择容器状态" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="容器编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="containerCode">
+ <a-input v-model="model.containerCode" placeholder="请输入容器编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库位编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationCode">
+ <a-input v-model="model.locationCode" placeholder="请输入库位编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
+ <a-input v-model="model.materialCode" placeholder="请输入物料编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
+ <a-input v-model="model.materialName" placeholder="请输入物料名称" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialSpec">
+ <a-input v-model="model.materialSpec" placeholder="请输入物料规格" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="物料单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialUnit">
+ <a-input v-model="model.materialUnit" placeholder="请输入物料单位" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库存状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryStatus">
+ <j-dict-select-tag type="list" v-model="model.inventoryStatus" dictCode="inventory_status" placeholder="请选择库存状态" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="库龄（天）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryAge">
+ <a-input-number v-model="model.inventoryAge" placeholder="请输入库龄（天）" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="唯一号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="uniqueCode">
+ <a-input v-model="model.uniqueCode" placeholder="请输入唯一号" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+ import { httpAction, getAction } from '@/api/manage'
+ import { validateDuplicateValue } from '@/utils/util'
+
+ export default {
+ name: 'InventoryChildForm',
+ components: {
+ },
+ props: {
+ //表单禁用
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+validatorRules: {
+ materialCode: [
+ { required: true, message: '请输入物料编码!'},
+ ],
+ materialName: [
+ { required: true, message: '请输入物料名称!'},
+ ],
+ uniqueCode: [
+ { required: true, message: '请输入唯一号!'},
+ ],
+},
+ url: {
+ add: "/inventory/inventoryChild/add",
+ edit: "/inventory/inventoryChild/edit",
+ queryById: "/inventory/inventoryChild/queryById"
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ //备份model原始值
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ methods: {
+ add () {
+ this.edit(this.modelDefault);
+ },
+ edit (record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ submitForm () {
+ const that = this;
+ // 触发表单验证
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ httpAction(httpurl,this.model,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+
+ })
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.Style#Drawer.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.Style#Drawer.vue
new file mode 100644
index 0000000..8ed125b
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ destroyOnClose
+ :visible="visible">
+ <inventory-child-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></inventory-child-form>
+ <div class="drawer-footer">
+ <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+ <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+ </div>
+ </a-drawer>
+</template>
+
+<script>
+
+ import InventoryChildForm from './InventoryChildForm'
+
+ export default {
+ name: 'InventoryChildModal',
+ components: {
+ InventoryChildForm
+ },
+ data () {
+ return {
+ title:"操作",
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ });
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+ .ant-btn {
+ margin-left: 30px;
+ margin-bottom: 30px;
+ float: right;
+ }
+ .drawer-footer{
+ position: absolute;
+ bottom: -8px;
+ width: 100%;
+ border-top: 1px solid #e8e8e8;
+ padding: 10px 16px;
+ text-align: right;
+ left: 0;
+ background: #fff;
+ border-radius: 0 0 2px 2px;
+ }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.vue b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.vue
new file mode 100644
index 0000000..1c8d7f9
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/system/inventory/modules/InventoryChildModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <inventory-child-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inventory-child-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import InventoryChildForm from './InventoryChildForm'
+ export default {
+ name: 'InventoryChildModal',
+ components: {
+ InventoryChildForm
+ },
+ data () {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index ade4055..58be62c 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -178,7 +178,7 @@
</template>
<span slot="action" slot-scope="text, record">
<a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
- <a>回传</a>
+ <a>回传<a-divider type="vertical"/></a>
</a-popconfirm>
<a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'">自动配盘<a-divider type="vertical"/></a>
<a-dropdown>
diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
index 02f1185..abb9f5c 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
@@ -21,7 +21,6 @@
show-search
placeholder="请选择库区"
option-filter-prop="children"
-
v-model="queryParam.zoneCode">
<a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
{{item.name}}
@@ -142,20 +141,7 @@
<a-divider type="vertical"/></a>
<a v-if="record.isDoubleIn == 1 && record.exceptionState == 1" v-has="'taskHeader:executeTask'" @click="handleDoubleInTask(record)">修复重入数据
<a-divider type="vertical"/></a>
- <a v-if="record.status < 100" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)">取消<a-divider type="vertical"/></a>
- <a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
- <a-menu slot="overlay">
- <a-menu-item v-has="'taskHeader:edit'">
- <a @click="handleEdit(record)">编辑</a>
- </a-menu-item>
- <a-menu-item v-has="'taskHeader:delete'">
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a v-if="record.status < 100" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)" >取消</a>
</span>
</a-table>
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
index 32f5837..7c6c222 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
@@ -33,7 +33,7 @@ public interface IContainerService extends IService<Container> {
/**
* 判断系统是否已经有同样的库位号，如果有证明数据混乱了
*/
- boolean havaLocationCodeByContainer(String locationCode, String warehouseCode);
+ boolean havaLocationCodeByContainer(String locationCode, String containerCode, String warehouseCode);
List<Container> getContainerListByCodeList(List<String> containCodeList, String warehouseCode);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
index 7e14770..dc5c6a7 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
@@ -100,7 +100,7 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
}
boolean success = false;
if (StringUtils.isNotEmpty(locationCode)) {
- success = havaLocationCodeByContainer(locationCode, warehouseCode);
+ success = havaLocationCodeByContainer(locationCode, containerCode, warehouseCode);
if (success) {
throw new JeecgBootException("容器表已经存在这个库位号，不能再写入");
}
@@ -133,9 +133,10 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
}
@Override
- public boolean havaLocationCodeByContainer(String locationCode, String warehouseCode) {
+ public boolean havaLocationCodeByContainer(String locationCode, String containerCode, String warehouseCode) {
LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
- containerLambdaQueryWrapper.eq(Container::getLocationCode, locationCode).eq(Container::getWarehouseCode, warehouseCode);
+ containerLambdaQueryWrapper.eq(Container::getLocationCode, locationCode).ne(Container::getCode, containerCode).eq(Container::getWarehouseCode,
+ warehouseCode);
Container container = getOne(containerLambdaQueryWrapper);
if (container == null) {
return false;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
index e7d5f56..44b67d4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
@@ -54,7 +54,7 @@ public interface ILocationService extends IService<Location> {
/**
* 判断系统是否已经有同样的托盘号，如果有证明数据混乱了
*/
- boolean havaContainerCodeInLocation(String containerCode, String warehouseCode);
+ boolean havaContainerCodeInLocation(String containerCode, String locationCode, String warehouseCode);
List<Location> getContainerInLocation(String containerCode, String containerStatus, String locationCode, String warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
index ea786fd..8a531ba 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -114,7 +114,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
boolean success = false;
// 如果这个托盘号已经在库位表里，那么不能再写入
if (StringUtils.isNotEmpty(containerCode)) {
- success = havaContainerCodeInLocation(containerCode, warehouseCode);
+ success = havaContainerCodeInLocation(containerCode, locationCode, warehouseCode);
if (success) {
throw new JeecgBootException("库位表已经存在这个容器号，不能再写入");
}
@@ -359,9 +359,9 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
}
@Override
- public boolean havaContainerCodeInLocation(String containerCode, String warehouseCode) {
+ public boolean havaContainerCodeInLocation(String containerCode, String locationCode, String warehouseCode) {
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
- locationLambdaQueryWrapper.eq(Location::getContainerCode, containerCode).eq(Location::getWarehouseCode, warehouseCode);
+ locationLambdaQueryWrapper.eq(Location::getContainerCode, containerCode).ne(Location::getCode, locationCode).eq(Location::getWarehouseCode, warehouseCode);
Location location = getOne(locationLambdaQueryWrapper);
if (location == null) {
return false;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/controller/InventoryChildController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/controller/InventoryChildController.java
new file mode 100644
index 0000000..c50dfa5
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/controller/InventoryChildController.java
@@ -0,0 +1,148 @@
+package org.jeecg.modules.wms.inventory.inventoryChild.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.wms.inventory.inventoryChild.entity.InventoryChild;
+import org.jeecg.modules.wms.inventory.inventoryChild.service.IInventoryChildService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 库存明细
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
+ */
+@Api(tags = "库存明细")
+@RestController
+@RequestMapping("/inventory/inventoryChild")
+@Slf4j
+public class InventoryChildController extends JeecgController<InventoryChild, IInventoryChildService> {
+ @Autowired
+ private IInventoryChildService inventoryChildService;
+
+ /**
+ * 分页列表查询
+ * @param inventoryChild
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ // @AutoLog(value = "库存明细-分页列表查询")
+ @ApiOperation(value = "库存明细-分页列表查询", notes = "库存明细-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<InventoryChild>> queryPageList(InventoryChild inventoryChild, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ QueryWrapper<InventoryChild> queryWrapper = QueryGenerator.initQueryWrapper(inventoryChild, req.getParameterMap());
+ Page<InventoryChild> page = new Page<InventoryChild>(pageNo, pageSize);
+ IPage<InventoryChild> pageList = inventoryChildService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ * @param inventoryChild
+ * @return
+ */
+ @AutoLog(value = "库存明细-添加")
+ @ApiOperation(value = "库存明细-添加", notes = "库存明细-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody InventoryChild inventoryChild) {
+ inventoryChildService.save(inventoryChild);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ * @param inventoryChild
+ * @return
+ */
+ @AutoLog(value = "库存明细-编辑")
+ @ApiOperation(value = "库存明细-编辑", notes = "库存明细-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody InventoryChild inventoryChild) {
+ inventoryChildService.updateById(inventoryChild);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "库存明细-通过id删除")
+ @ApiOperation(value = "库存明细-通过id删除", notes = "库存明细-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ inventoryChildService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "库存明细-批量删除")
+ @ApiOperation(value = "库存明细-批量删除", notes = "库存明细-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.inventoryChildService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ // @AutoLog(value = "库存明细-通过id查询")
+ @ApiOperation(value = "库存明细-通过id查询", notes = "库存明细-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<InventoryChild> queryById(@RequestParam(name = "id", required = true) String id) {
+ InventoryChild inventoryChild = inventoryChildService.getById(id);
+ if (inventoryChild == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(inventoryChild);
+ }
+
+ /**
+ * 导出excel
+ * @param request
+ * @param inventoryChild
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, InventoryChild inventoryChild) {
+ return super.exportXls(request, inventoryChild, InventoryChild.class, "库存明细");
+ }
+
+ /**
+ * 通过excel导入数据
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, InventoryChild.class);
+ }
+
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java
new file mode 100644
index 0000000..9c40ca1
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/entity/InventoryChild.java
@@ -0,0 +1,108 @@
+package org.jeecg.modules.wms.inventory.inventoryChild.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 库存明细
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("inventory_child")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="inventory_child对象", description="库存明细")
+public class InventoryChild implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**库存头ID*/
+ @Excel(name = "库存头ID", width = 15)
+ @ApiModelProperty(value = "库存头ID")
+ private Integer inventoryHeaderId;
+ /**仓库编码*/
+ @Excel(name = "仓库编码", width = 15)
+ @ApiModelProperty(value = "仓库编码")
+ private String warehouseCode;
+ /**货主*/
+ @Excel(name = "货主", width = 15)
+ @ApiModelProperty(value = "货主")
+ private String companyCode;
+ /**库区*/
+ @Excel(name = "库区", width = 15)
+ @ApiModelProperty(value = "库区")
+ private String zoneCode;
+ /**容器状态*/
+ @Excel(name = "容器状态", width = 15, dicCode = "container_status")
+ @Dict(dicCode = "container_status")
+ @ApiModelProperty(value = "容器状态")
+ private String containerStatus;
+ /**容器编码*/
+ @Excel(name = "容器编码", width = 15)
+ @ApiModelProperty(value = "容器编码")
+ private String containerCode;
+ /**库位编码*/
+ @Excel(name = "库位编码", width = 15)
+ @ApiModelProperty(value = "库位编码")
+ private String locationCode;
+ /**物料编码*/
+ @Excel(name = "物料编码", width = 15)
+ @ApiModelProperty(value = "物料编码")
+ private String materialCode;
+ /**物料名称*/
+ @Excel(name = "物料名称", width = 15)
+ @ApiModelProperty(value = "物料名称")
+ private String materialName;
+ /**物料规格*/
+ @Excel(name = "物料规格", width = 15)
+ @ApiModelProperty(value = "物料规格")
+ private String materialSpec;
+ /**物料单位*/
+ @Excel(name = "物料单位", width = 15)
+ @ApiModelProperty(value = "物料单位")
+ private String materialUnit;
+ /**库存状态*/
+ @Excel(name = "库存状态", width = 15, dicCode = "inventory_status")
+ @Dict(dicCode = "inventory_status")
+ @ApiModelProperty(value = "库存状态")
+ private String inventoryStatus;
+ /**库龄（天）*/
+ @Excel(name = "库龄（天）", width = 15)
+ @ApiModelProperty(value = "库龄（天）")
+ private Integer inventoryAge;
+ /**唯一号*/
+ @Excel(name = "唯一号", width = 15)
+ @ApiModelProperty(value = "唯一号")
+ private String uniqueCode;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/InventoryChildMapper.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/InventoryChildMapper.java
new file mode 100644
index 0000000..bb9990d
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/InventoryChildMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.wms.inventory.inventoryChild.mapper;
+
+import org.jeecg.modules.wms.inventory.inventoryChild.entity.InventoryChild;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 库存明细
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
+ */
+public interface InventoryChildMapper extends BaseMapper<InventoryChild> {
+
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/xml/InventoryChildMapper.xml b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/xml/InventoryChildMapper.xml
new file mode 100644
index 0000000..9e78360
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/mapper/xml/InventoryChildMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.wms.inventory.inventoryChild.mapper.InventoryChildMapper">
+
+</mapper>
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/IInventoryChildService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/IInventoryChildService.java
new file mode 100644
index 0000000..7469820
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/IInventoryChildService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.wms.inventory.inventoryChild.service;
+
+import org.jeecg.modules.wms.inventory.inventoryChild.entity.InventoryChild;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 库存明细
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
+ */
+public interface IInventoryChildService extends IService<InventoryChild> {
+
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/impl/InventoryChildServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/impl/InventoryChildServiceImpl.java
new file mode 100644
index 0000000..e9d506f
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryChild/service/impl/InventoryChildServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.wms.inventory.inventoryChild.service.impl;
+
+import org.jeecg.modules.wms.inventory.inventoryChild.entity.InventoryChild;
+import org.jeecg.modules.wms.inventory.inventoryChild.mapper.InventoryChildMapper;
+import org.jeecg.modules.wms.inventory.inventoryChild.service.IInventoryChildService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 库存明细
+ * @Author: jeecg-boot
+ * @Date: 2023-03-24
+ * @Version: V1.0
+ */
+@Service
+public class InventoryChildServiceImpl extends ServiceImpl<InventoryChildMapper, InventoryChild> implements IInventoryChildService {
+
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryHeaderService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryHeaderService.java
index 327390a..4982320 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryHeaderService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryHeaderService.java
@@ -1,12 +1,11 @@
package org.jeecg.modules.wms.inventory.inventoryHeader.service;
-import com.alipay.api.domain.Inventory;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
import java.util.Collection;
-import java.util.List;
+
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
+
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 库存表
@@ -27,4 +26,6 @@ public interface IInventoryHeaderService extends IService<InventoryHeader> {
public void delBatchMain(Collection<? extends Serializable> idList);
InventoryHeader getInventoryHeaderByContainerCode(String containerCode, String warehouseCode);
+
+ boolean updateInventoryContainerStatusByContainerCode(String containerCode, String warehouseCode);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
index 26257ce..5cf7fa1 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
@@ -1,20 +1,23 @@
package org.jeecg.modules.wms.inventory.inventoryHeader.service.impl;
-import com.alipay.api.domain.Inventory;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import java.io.Serializable;
+import java.util.Collection;
+
+import javax.annotation.Resource;
+
+import org.jeecg.modules.wms.config.container.entity.Container;
+import org.jeecg.modules.wms.config.container.service.IContainerService;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
import org.jeecg.modules.wms.inventory.inventoryHeader.mapper.InventoryDetailMapper;
import org.jeecg.modules.wms.inventory.inventoryHeader.mapper.InventoryHeaderMapper;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.Collection;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 库存表
@@ -29,6 +32,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
private InventoryHeaderMapper inventoryHeaderMapper;
@Autowired
private InventoryDetailMapper inventoryDetailMapper;
+ @Resource
+ private IContainerService containerService;
+ @Resource
+ private IInventoryHeaderService inventoryHeaderService;
@Override
@Transactional
@@ -54,4 +61,19 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
return inventoryHeader;
}
+ @Override
+ public boolean updateInventoryContainerStatusByContainerCode(String containerCode, String warehouseCode) {
+ Container container = containerService.getContainerByCode(containerCode, warehouseCode);
+ if (container == null) {
+ return false;
+ }
+ InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
+ if (inventoryHeader != null) {
+ inventoryHeader.setContainerStatus(container.getStatus());
+ boolean success = inventoryHeaderService.updateById(inventoryHeader);
+ return success;
+ }
+ return false;
+ }
+
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
index 35da4f7..9a3543a 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -9,10 +9,12 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.wms.config.container.entity.Container;
import org.jeecg.modules.wms.config.container.service.IContainerService;
import org.jeecg.modules.wms.config.location.entity.Location;
import org.jeecg.modules.wms.config.location.service.ILocationService;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerDetail;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.mapper.ReceiptContainerDetailMapper;
@@ -33,7 +35,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
-import org.jeecg.common.exception.JeecgBootException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -70,6 +71,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
private IReceiptDetailService receiptDetailService;
@Resource
private IReceiptHeaderService receiptHeaderService;
+ @Resource
+ private IInventoryHeaderService inventoryHeaderService;
@Override
@Transactional
@@ -208,6 +211,12 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
if (!success) {
throw new JeecgBootException("生成任务时，更新入库组盘头失败");
}
+ if (receiptContainerHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
+ success = inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode);
+ if (!success) {
+ throw new JeecgBootException("生成任务时, 更新库存头失败");
+ }
+ }
success = receiptDetailService.updateBatchById(receiptDetailList);
if (!success) {
throw new JeecgBootException("更新入库单明细失败");
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 6c5ff06..0e7560f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -15,7 +15,6 @@ import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.config.material.service.IMaterialService;
import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
-import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
@@ -41,6 +40,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
+import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -342,7 +342,9 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
if (shipmentContainerHeader != null) {
if (taskType != shipmentContainerHeader.getTaskType()) {
shipmentContainerHeader.setTaskType(taskType);
- shipmentContainerHeaderService.updateById(shipmentContainerHeader);
+ if (!shipmentContainerHeaderService.updateById(shipmentContainerHeader)) {
+ throw new ServiceException("更新出库组盘头任务类型失败");
+ }
}
} else {
shipmentContainerHeader = new ShipmentContainerHeader();
@@ -560,13 +562,9 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
if (!success) {
throw new JeecgBootException("生成出库任务时, 更新出库组盘头失败");
}
- InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
- if (inventoryHeader != null) {
- inventoryHeader.setContainerStatus(container.getStatus());
- success = inventoryHeaderService.updateById(inventoryHeader);
- if (!success) {
- throw new JeecgBootException("生成出库任务时, 更新库存头失败");
- }
+ success = inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode);
+ if (!success) {
+ throw new JeecgBootException("生成出库任务时, 更新库存头失败");
}
LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集
LogRecordContext.putVariable("shipmentContainerDetailList", shipmentContainerDetailList);// 操作日志收集