Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop

谭毅彬
2 parents 0bc24559 aaf6ef5f
Showing 12 changed files with 192 additions and 93 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -10,7 +10,7 @@
                 <j-multi-select-tag
                   v-model="queryParam.zoneCode"
                   :options="zoneOptions"
-                  placeholder="请选择">
+                  placeholder="请选择库区">
                 </j-multi-select-tag>
               </a-form-model-item>
             </a-form-item>
@@ -6,16 +6,13 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="库区">
-              <a-select
-                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 }}
-                </a-select-option>
-              </a-select>
+              <a-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择库区">
+                </j-multi-select-tag>
+              </a-form-model-item>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -139,6 +136,7 @@ export default {
   data() {
     return {
       zoneList: [],
+      zoneOptions:[],
       companyList: [],
       selectedMainId: '',
       description: '物料汇总主表管理页面',
@@ -237,11 +235,19 @@ export default {
       return actions.join('')
     },
     loadFrom() {
-      getZoneList().then(res => {
+      getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
-      })
+      });
       ajaxGetDictItems('box_type').then(res => {
         if (res.success) {
           this.boxTypeList = res.result
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择库区">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="货主">
               <a-select
                 show-search
@@ -152,6 +163,13 @@
           </a-tag>
         </span>
+        <span slot="zoneCode" slot-scope="zoneCode">
+          <a-tag :key="zoneCode" color="blue">
+            {{ solutionZoneCode(zoneCode) }}
+          </a-tag>
+        </span>
+      </a-table>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -204,7 +222,7 @@ import {mixinDevice} from &#39;@/utils/mixin&#39;
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import InventoryTransactionModal from './modules/InventoryTransactionModal'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import {getCompanyList} from '@/api/api'
+import {getCompanyList, getZoneList} from '@/api/api'
 export default {
   name: 'InventoryTransactionList',
@@ -216,6 +234,8 @@ export default {
     return {
       description: '库存交易记录管理页面',
       companyList: [],
+      zoneList: [],
+      zoneOptions:[],
       // 表头
       columns: [
         {
@@ -224,12 +244,19 @@ export default {
           dataIndex: 'id'
         },
         {
-          title: '货主',
-          align: "center",
-          dataIndex: 'companyCode',
-          key: 'companyCode',
-          scopedSlots: {customRender: 'companyCode'}
+          title: '库区',
+          align: 'center',
+          dataIndex: 'zoneCode',
+          key: 'zoneCode',
+          scopedSlots: { customRender: 'zoneCode' }
         },
+        // {
+        //   title: '货主',
+        //   align: "center",
+        //   dataIndex: 'companyCode',
+        //   key: 'companyCode',
+        //   scopedSlots: {customRender: 'companyCode'}
+        // },
         {
           title: '容器编码',
           align: "center",
@@ -292,6 +319,16 @@ export default {
           dataIndex: 'batch'
         },
         {
+          title: '入库单编码',
+          align: "center",
+          dataIndex: 'receiptCode'
+        },
+        {
+          title: '出库单编码',
+          align: "center",
+          dataIndex: 'shipmentCode'
+        },
+        {
           title: '创建人',
           align: "center",
           dataIndex: 'createBy'
@@ -355,13 +392,35 @@ export default {
     initDictConfig() {
     },
     loadFrom() {
-      console.log("loadFrom 11");
+      getZoneList().then((res) => {
+        if (res.success) {
+          this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
+        }
+      });
       getCompanyList().then((res) => {
         if (res.success) {
           this.companyList = res.result
         }
       });
     },
+    solutionZoneCode(value) {
+      var actions = []
+      Object.keys(this.zoneList).some(key => {
+        if (this.zoneList[key].code === '' + value) {
+          actions.push(this.zoneList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
     solutionCompany(value) {
       var actions = []
       Object.keys(this.companyList).some((key) => {
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择库区">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="货主">
               <a-select
                 show-search
@@ -19,19 +30,6 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-select
-                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}}
-                </a-select-option>
-              </a-select>
-            </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>
@@ -232,6 +230,7 @@ export default {
   data() {
     return {
       zoneList: [],
+      zoneOptions:[],
       companyList: [],
       description: '库存详情管理页面',
       // 表头
@@ -398,6 +397,14 @@ export default {
       getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
       });
       getCompanyList().then(res => {
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务ID">
               <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
             </a-form-item>
@@ -20,20 +31,6 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-select
-                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}}
-                </a-select-option>
-              </a-select>
-            </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.fromLocationCode"></a-input>
             </a-form-item>
@@ -207,6 +204,7 @@ export default {
     return {
       description: '任务表管理页面',
       zoneList: [],
+      zoneOptions:[],
       isorter: {
         column: 'status',
         order: 'asc',
@@ -410,6 +408,14 @@ export default {
       getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
       });
     },
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务ID">
               <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
             </a-form-item>
@@ -20,19 +31,6 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-select
-                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}}
-                </a-select-option>
-              </a-select>
-            </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.fromLocationCode"></a-input>
             </a-form-item>
@@ -201,6 +199,7 @@ export default {
     return {
       description: '任务表管理页面',
       zoneList: [],
+      zoneOptions:[],
       isorter: {
         column: 'status',
         order: 'asc',
@@ -405,6 +404,14 @@ export default {
       getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
       });
     },
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务ID">
               <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
             </a-form-item>
@@ -20,19 +31,6 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-select
-                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}}
-                </a-select-option>
-              </a-select>
-            </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.fromLocationCode"></a-input>
             </a-form-item>
@@ -201,10 +199,12 @@ export default {
   data() {
     return {
       description: '任务表管理页面',
+      zoneList: [],
       isorter: {
         column: 'status',
         order: 'asc',
       },
+      zoneOptions:[],
       // 表头
       columns: [
         {
@@ -380,6 +380,14 @@ export default {
       getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
       });
     },
@@ -5,6 +5,17 @@
       <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-form-model-item   prop="zoneOptions">
+                <j-multi-select-tag
+                  v-model="queryParam.zoneCode"
+                  :options="zoneOptions"
+                  placeholder="请选择">
+                </j-multi-select-tag>
+              </a-form-model-item>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务ID">
               <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
             </a-form-item>
@@ -20,19 +31,6 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="库区">
-              <a-select
-                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}}
-                </a-select-option>
-              </a-select>
-            </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.fromLocationCode"></a-input>
             </a-form-item>
@@ -205,6 +203,7 @@ export default {
     return {
       description: '任务表管理页面',
       zoneList: [],
+      zoneOptions:[],
       isorter: {
         column: 'status',
         order: 'asc',
@@ -412,6 +411,14 @@ export default {
       getZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
+          //延迟半秒执行,避免组件未加载完,数据已经加载完
+          setTimeout(()=>{
+            //slice可以在数组的任何位置进行删除/添加操作
+            this.zoneOptions.splice(0, 1);
+            for (let i = 0; i < res.result.length; i++) {
+              this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
+            }
+          },500)
         }
       });
     },
@@ -15,6 +15,7 @@ import org.jeecg.modules.wms.config.containerType.entity.ContainerType;
 import org.jeecg.modules.wms.config.containerType.service.IContainerTypeService;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
+import org.jeecg.modules.wms.config.locationHigh.service.ILocationHighService;
 import org.jeecg.modules.wms.config.locationType.entity.LocationType;
 import org.jeecg.modules.wms.config.locationType.service.ILocationTypeService;
 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
@@ -48,6 +49,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
     @Resource
     private IZoneService zoneService;
     @Resource
+    private ILocationHighService locationHighService;
+    @Resource
     private IParameterConfigurationService parameterConfigurationService;
     @Resource
     private LocationAllocationService locationAllocationService;
@@ -121,7 +124,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         }
         roadWays.removeAll(removeRoadWays);
         if (roadWays == null || roadWays.size() == 0) {
-            throw new JeecgBootException("分配库位时, 巷道为空");
+            throw new JeecgBootException("分配库位时, 可用巷道为空");
         }
         Collections.shuffle(roadWays);
         Integer roadWay = locationAllocationService.getRoadWay(roadWays, warehouseCode);
@@ -178,7 +181,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         }
         String lastString = "ORDER BY high asc, layer asc, id asc limit 1";
         if (roadWays == null || roadWays.size() == 0) {
-            throw new JeecgBootException("分配库位时, 巷道为空");
+            throw new JeecgBootException("分配库位时, 可用巷道为空");
         }
         Collections.shuffle(roadWays);
         Integer roadWay = locationAllocationService.getRoadWay(roadWays, warehouseCode);
@@ -173,7 +173,7 @@ public class WcsServiceImpl implements WcsService {
         locationHighLambdaQueryWrapper.eq(LocationHigh::getHighLevel, highHeight).in(LocationHigh::getLocationTypeCode, locationTypeCodeList);
         LocationHigh locationHigh = locationHighService.getOne(locationHighLambdaQueryWrapper);
         if (locationHigh == null) {
-            return Result.error("分配库位时，没有找到库位高度");
+            return Result.error("分配库位时，高度不匹配，WCS给的高度值" + highHeight + "不在WMS系统配置范围内");
         }
         int high = locationHigh.getHigh();
         String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_ALLOCATION);
@@ -2,7 +2,6 @@ package org.jeecg.modules.wms.receipt.receiptContainerHeader.controller;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -209,7 +208,6 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
     @PostMapping(value = "/addReceiptContainerDetail")
     @RequiresPermissions("receiptContainerDetail:add")
     public Result<String> addReceiptContainerDetail(@RequestBody ReceiptContainerDetail receiptContainerDetail) {
-        receiptContainerDetail.setReceiveTime(new Date());
         receiptContainerDetailService.save(receiptContainerDetail);
         return Result.OK("添加成功！");
     }
@@ -2,7 +2,6 @@ package org.jeecg.modules.wms.receipt.receiving.service.impl;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -251,7 +250,6 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
                 receiptContainerDetail.setLot(receiptDetail.getLot());
                 receiptContainerDetail.setProject(receiptDetail.getProject());
                 receiptContainerDetail.setInventoryStatus(receiptDetail.getInventoryStatus());
-                receiptContainerDetail.setReceiveTime(new Date());
                 receiptContainerDetailList.add(receiptContainerDetail);
             }
         }