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

肖超群
2 parents e9673555 55cf91cf
Showing 26 changed files with 350 additions and 84 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/HuahengBaseController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentHeader.java
@@ -195,6 +195,8 @@ export const combination = (params) =&gt; postAction(&#39;/shipment/shipmentCombination
 export const backErpReceipt = (params) => postAction('/receipt/receiptHeader/backErpReceipt', params);
 //回传出库单
 export const backErpShipment = (params) => postAction('/shipment/shipmentHeader/backErpShipment', params);
+//合并出库单
+export const mergeShipment = (params) => postAction('/shipment/shipmentHeader/mergeShipment', params);
 //首页取值
 export const deliveringAmount = (params) => postAction("/sys/home/deliveringAmount", params);
 export const inventoryUtilization = (params) => postAction("/sys/home/inventoryUtilization", params);
@@ -107,7 +107,7 @@
     </div>
     <a-tabs defaultActiveKey="1">
-      <a-tab-pane tab="bom子表" key="1">
+      <a-tab-pane tab="BOM详情" key="1">
         <BomDetailList :mainId="selectedMainId"/>
       </a-tab-pane>
     </a-tabs>
@@ -136,7 +136,7 @@ export default {
   data() {
     return {
       companyList: [],
-      description: 'bom主表管理页面',
+      description: 'BOM主表管理页面',
       // 表头
       columns: [
         {
@@ -286,6 +286,7 @@ export default {
         '报废品': 'purple',
         '待确认	': 'grey',
         '次品': 'red',
+        '锁定': 'red',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -175,6 +175,12 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
+        <span slot="containerStatus_dictText" slot-scope="containerStatus_dictText">
+            <a-tag :key="containerStatus_dictText" :color="getStatusColor(containerStatus_dictText)">
+              {{ containerStatus_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="enable_dictText" slot-scope="enable_dictText">
           <a-tag :key="enable_dictText" :color="getStatusColor(enable_dictText)">
             {{ enable_dictText }}
@@ -282,6 +288,12 @@ export default {
           dataIndex: 'containerCode'
         },
         {
+          title: '容器状态',
+          align: "center",
+          dataIndex: 'containerStatus_dictText',
+          scopedSlots: {customRender: 'containerStatus_dictText'}
+        },
+        {
           title: '库位编码',
           align: 'center',
           dataIndex: 'locationCode'
@@ -416,6 +428,7 @@ export default {
         '报废品': 'purple',
         '待确认	': 'grey',
         '次品': 'red',
+        '锁定': 'red',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -346,40 +346,39 @@ export default {
       this.$refs.modalForm4.title = "选择容器状态";
     },
     createBatchTask() {
-      if (this.selectedRowKeys.length <= 1) {
-        this.$message.warning('至少选择两条记录！')
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('至少选择一条记录！')
         return
-      } else {
-        var receiptContainerHeaderList = []
-        var receiptContainerHeader = null
-        for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
-            if (receiptContainerHeader == null) {
-              receiptContainerHeader = this.selectionRows[a]
-            }
-            if (receiptContainerHeader.taskType == this.selectionRows[a].taskType) {
-              receiptContainerHeaderList.push(this.selectionRows[a])
-            }
+      }
+      var receiptContainerHeaderList = []
+      var receiptContainerHeader = null
+      for (var a = 0; a < this.selectedRowKeys.length; a++) {
+        if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+          if (receiptContainerHeader == null) {
+            receiptContainerHeader = this.selectionRows[a]
           }
-        }
-        if (receiptContainerHeaderList.length > 1) {
-          if (receiptContainerHeader.taskType == 100) {
-            createReceiptBatchTask(receiptContainerHeaderList).then(res => {
-              this.loading = false
-              if (res.success) {
-                this.$message.success(res.message)
-              } else {
-                this.$message.error(res.message)
-              }
-              this.searchQuery()
-            })
-          } else {
-            this.$refs.modalForm2.batchEdit(receiptContainerHeaderList)
-            this.$refs.modalForm2.title = '选择出库口'
+          if (receiptContainerHeader.taskType == this.selectionRows[a].taskType) {
+            receiptContainerHeaderList.push(this.selectionRows[a])
           }
+        }
+      }
+      if (receiptContainerHeaderList.length > 0) {
+        if (receiptContainerHeader.taskType == 100) {
+          createReceiptBatchTask(receiptContainerHeaderList).then(res => {
+            this.loading = false
+            if (res.success) {
+              this.$message.success(res.message)
+            } else {
+              this.$message.error(res.message)
+            }
+            this.searchQuery()
+          })
         } else {
-          this.$message.error("至少选择两条符合条件的记录！")
+          this.$refs.modalForm2.batchEdit(receiptContainerHeaderList)
+          this.$refs.modalForm2.title = '选择出库口'
         }
+      } else {
+        this.$message.error("没有符合生成条件的记录！")
       }
     },
     cancelBatchTask() {
@@ -388,7 +387,7 @@ export default {
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
+        this.$message.warning('至少选择一条记录！');
         return;
       }
       var ids = "";
@@ -49,8 +49,14 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
+        <span slot="status_dictText" slot-scope="status_dictText">
+            <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
+              {{ status_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
-          <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+          <a-tag :key="inventoryStatus_dictText" :color="getInventoryStatusColor(inventoryStatus_dictText)">
             {{ inventoryStatus_dictText }}
           </a-tag>
         </span>
@@ -178,6 +184,7 @@ export default {
           title: '单据状态',
           align: "center",
           dataIndex: 'status_dictText',
+          scopedSlots: {customRender: 'status_dictText'}
         },
         {
           title: '创建人',
@@ -231,6 +238,19 @@ export default {
   methods: {
     getStatusColor(status) {
       const colors = {
+        '新建': 'green',
+        '收货': 'Skyblue',
+        '等待上架': 'blue',
+        '上架': 'darkorange',
+        '过账': 'purple',
+        '回传': 'grey',
+        '回传失败': 'red',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
+    getInventoryStatusColor(status) {
+      const colors = {
         '良品': 'green',
         '报废品': 'purple',
         '待确认	': 'grey',
@@ -187,10 +187,10 @@
                <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
                   <a @click="openProcess(record)" type="primary">审核进度</a>
                </a-menu-item>
-              <a-menu-item v-has="'receiptHeader:edit'">
+              <a-menu-item v-has="'receiptHeader:edit'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                   <a @click="handleEdit(record)">编辑</a>
                </a-menu-item>
-              <a-menu-item v-has="'receiptHeader:delete'">
+              <a-menu-item v-has="'receiptHeader:delete'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -505,7 +505,7 @@ export default {
         if (res.success) {
           this.$message.success(res.message);
         } else {
-          that.$message.warning(res.message);
+          this.$message.warning(res.message);
         }
         this.searchQuery();
       });
@@ -297,8 +297,8 @@ export default {
       this.$refs.modalForm2.title = "选择出库口";
     },
     createBatchTask() {
-      if (this.selectedRowKeys.length <= 1) {
-        this.$message.warning('至少选择两条记录！')
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('至少选择一条记录！')
         return
       }
       var shipmentContainerHeaderList = []
@@ -317,7 +317,7 @@ export default {
         this.$refs.modalForm2.batchEdit(shipmentContainerHeaderList)
         this.$refs.modalForm2.title = '选择出库口'
       } else {
-        this.$message.error("至少选择两条符合条件的记录！")
+        this.$message.error("没有符合生成条件的记录！")
       }
     },
     cancelBatchTask() {
@@ -326,7 +326,7 @@ export default {
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！')
+        this.$message.warning('至少选择一条记录！')
         return
       }
       var ids = ''
@@ -48,8 +48,14 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
+        <span slot="status_dictText" slot-scope="status_dictText">
+            <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
+              {{ status_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
-          <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+          <a-tag :key="inventoryStatus_dictText" :color="getInventoryStatusColor(inventoryStatus_dictText)">
             {{ inventoryStatus_dictText }}
           </a-tag>
         </span>
@@ -218,6 +224,7 @@ export default {
           title: '单据状态',
           align: "center",
           dataIndex: 'status_dictText',
+          scopedSlots: {customRender: 'status_dictText'}
         },
         {
           title: '创建人',
@@ -272,6 +279,19 @@ export default {
   methods: {
     getStatusColor(status) {
       const colors = {
+        '新建': 'green',
+        '出库组盘': 'Skyblue',
+        '等待下架': 'blue',
+        '下架': 'darkorange',
+        '过账': 'purple',
+        '回传': 'grey',
+        '回传失败': 'red',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
+    getInventoryStatusColor(status) {
+      const colors = {
         '良品': 'green',
         '报废品': 'purple',
         '待确认	': 'grey',
@@ -105,9 +105,9 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'shipmentHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-has="'shipmentHeader:mergeShipment'" @click="mergeShipment" type="primary">合并单据</a-button>
       <a-button v-has="'shipmentHeader:export'" type="primary" icon="download" @click="handleExportXls('出库单')">导出</a-button>
-      <a-upload v-has="'shipmentHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-upload v-has="'shipmentHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
       <a-button type="primary" icon="import">导入</a-button>
       <a-button v-has="'shipmentHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
       </a-upload>
@@ -135,7 +135,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
         :customRow="clickThenSelect"
         @change="handleTableChange">
@@ -202,10 +202,10 @@
                 <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
                   <a @click="openProcess(record)" type="primary">审核进度</a>
                </a-menu-item>
-               <a-menu-item v-has="'shipmentHeader:edit'">
+               <a-menu-item v-has="'shipmentHeader:edit'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                   <a @click="handleEdit(record)">编辑</a>
                </a-menu-item>
-              <a-menu-item v-has="'shipmentHeader:delete'">
+              <a-menu-item v-has="'shipmentHeader:delete'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -241,7 +241,7 @@ import {getCompanyList, backErpShipment} from &#39;@/api/api&#39;
 import {getShipmentTypeList} from '@/api/api'
 import {getCustomerList} from '@/api/api'
 import {autoCombination} from '@/api/api'
-import {createShipmentAuditFlow,getDocumentAduitFlow} from '@/api/api'
+import {createShipmentAuditFlow, getDocumentAduitFlow, mergeShipment} from '@/api/api'
 import store from '@/store'
 import ShipmentAuditModal from "./modules/ShipmentAuditModal";
 import FlowProcess from "../flow/FlowProcess";
@@ -400,6 +400,31 @@ export default {
     }
   },
   methods: {
+    mergeShipment() {
+      if (this.selectedRowKeys.length <= 1) {
+        this.$message.warning('至少选择两条记录！')
+        return
+      }
+      var shipmentHeaderList = []
+      for (var a = 0; a < this.selectedRowKeys.length; a++) {
+        if (this.selectionRows[a] != null && this.selectionRows[a].firstStatus == 0 && this.selectionRows[a].lastStatus == 0) {
+          shipmentHeaderList.push(this.selectionRows[a])
+        }
+      }
+      if (shipmentHeaderList.length > 0) {
+        mergeShipment(shipmentHeaderList).then(res => {
+          this.loading = false
+          if (res.success) {
+            this.$message.success(res.message)
+            this.searchQuery()
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+      } else {
+        this.$message.error("至少选择两条符合条件的记录！")
+      }
+    },
     getDocumentAduitFlowStaus(){
       getDocumentAduitFlow().then((res) => {
         this.flowOff=res.message;
@@ -435,17 +460,21 @@ export default {
       this.selectedMainId = ''
     },
     onSelectChange(selectedRowKeys, selectionRows) {
-      this.selectedMainId = selectedRowKeys[0].toString();
+      if (selectedRowKeys.length > 0) {
+        this.selectedMainId = selectedRowKeys[0].toString();
+      }
       this.selectedRowKeys = selectedRowKeys;
       this.selectionRows = selectionRows;
-      this.flowStatus = selectionRows[0].firstStatus.toString();
+      if (selectionRows.length > 0) {
+        this.flowStatus = selectionRows[0].firstStatus.toString();
+      }
     },
     hanleBack(record) {
       backErpShipment(record).then((res) => {
         if (res.success) {
           this.$message.success(res.message);
         } else {
-          that.$message.warning(res.message);
+          this.$message.warning(res.message);
         }
         this.searchQuery();
       });
@@ -40,11 +40,11 @@ public class AcsController extends HuahengBaseController {
 //    @PassApiAuthentication
 //    @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
-    @ResponseBody
-    @PostMapping(value = "/testTokenCheck")
-    public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
-        return Result.ok();
-    }
+//    @ResponseBody
+//    @PostMapping(value = "/testTokenCheck")
+//    public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
+//        return Result.ok();
+//    }
     @PostMapping("/notifyAGVTask")
     @ResponseBody
@@ -6,6 +6,7 @@ import javax.annotation.Nonnull;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.support.RedissonDistributedLocker;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,14 +60,29 @@ public class HuahengBaseController {
      * @return
      */
     public Result<?> handleMultiProcess(@Nonnull String taskName, @Nonnull String lockKey, MultiProcessListener multiProcessListener) {
+        return this.handleMultiProcess(taskName, lockKey, WAIT_TIME, LEASE_TIME, multiProcessListener);
+    }
+
+    /**
+     * 获取分布式锁，自定义锁等待，释放时间</br>
+     * 注意锁与事务的顺序：获取分布式锁 -> 开启事务 -> 执行业务 -> 提交事务 -> 释放分布式锁
+     * @author                          TanYibin
+     * @createDate                      2023年2月8日
+     * @param      taskName
+     * @param      lockKey
+     * @param      multiProcessListener
+     * @return
+     */
+    public Result<?> handleMultiProcess(@Nonnull String taskName, @Nonnull String lockKey, @Nonnull Integer waitTime, @Nonnull Integer leaseTime,
+        MultiProcessListener multiProcessListener) {
         Result<?> result = null;
         final long startTime = SystemClock.now();
         final String fullLockKey = "RedissonLock_" + taskName + "_" + lockKey;
-        final boolean tryLock = redissonDistributedLocker.tryLock(fullLockKey, TimeUnit.SECONDS, WAIT_TIME, LEASE_TIME);
+        final boolean tryLock = redissonDistributedLocker.tryLock(fullLockKey, TimeUnit.SECONDS, waitTime, leaseTime);
         final long endTime = SystemClock.now();
         if (!tryLock) {
             log.error("[{}] 获取分布式锁失败 lockKey = {}，等待锁耗时：{}ms", taskName, fullLockKey, endTime - startTime);
-            throw new RuntimeException(StrUtil.format("[{}] 获取分布式锁失败 lockKey = {}，等待时间超出10秒", taskName, fullLockKey));
+            throw new RuntimeException(StrUtil.format("[{}] 获取分布式锁失败 lockKey = {}，超出设定等待时间：{}s", taskName, fullLockKey, waitTime));
         }
         // 注意：一定是获取锁成功后，才进行try{}finally{释放锁}
         try {
 package org.jeecg.modules.wms.framework.service;
+import java.util.List;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
 import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
@@ -16,8 +18,6 @@ import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
  */
 public interface IHuahengMultiHandlerService {
-    Result sendTaskToWcs(TaskHeader taskHeader);
-
     Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
     Result combination(CombinationModel combinationModel);
@@ -45,4 +45,9 @@ public interface IHuahengMultiHandlerService {
     Result backReceipt(ReceiptHeader receiptHeader);
     Result backShipment(ShipmentHeader shipmentHeader);
+
+    Result sendTaskToWcs(TaskHeader taskHeader, String zoneCode);
+
+    void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode);
+
 }
 package org.jeecg.modules.wms.framework.service.impl;
 import java.math.BigDecimal;
+import java.util.List;
 import javax.annotation.Resource;
@@ -26,11 +27,15 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @author 游杰
  */
+@Slf4j
 @Service
 public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implements IHuahengMultiHandlerService {
@@ -59,22 +64,42 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     private IErpService erpService;
     @Override
-    public Result sendTaskToWcs(TaskHeader taskHeader) {
+    public Result sendTaskToWcs(TaskHeader taskHeader, String zoneCode) {
         if (taskHeader == null) {
             return Result.error("任务信息为空");
         }
-        String lockKey = taskHeader.getWarehouseCode();
-        Result result = handleMultiProcess("sendTaskToWcs", lockKey, new MultiProcessListener() {
+        String lockKey = taskHeader.getWarehouseCode() + "_" + zoneCode;
+        Result result = handleMultiProcess("sendTaskToWcs", lockKey, 10, 300, new MultiProcessListener() {
+
             @Override
             public Result<?> doProcess() {
-                Result result = taskHeaderService.sendTaskToWcs(taskHeader.getId());
-                return result;
+                return taskHeaderService.sendTaskToWcs(taskHeader.getId());
             }
         });
         return result;
     }
     @Override
+    @Async("asyncPoolTaskExecutor")
+    public void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode) {
+        String lockKey = warehouseCode + "_" + zoneCode;
+        handleMultiProcess("sendTaskToWcs", lockKey, 10, 300, new MultiProcessListener() {
+
+            @Override
+            public Result<?> doProcess() {
+                for (TaskHeader taskHeader : taskHeaders) {
+                    try {
+                        taskHeaderService.sendTaskToWcs(taskHeader.getId());
+                    } catch (Exception e) {
+                        log.error("sendTaskToWcs 执行异常，errorMessage: {}", e.getMessage(), e);
+                    }
+                }
+                return Result.OK();
+            }
+        });
+    }
+
+    @Override
     public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
         Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() {
             @Override
 package org.jeecg.modules.wms.monitor.job;
-import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
-import org.apache.commons.collections.MapUtils;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.wms.config.container.entity.Container;
+import org.jeecg.modules.wms.config.container.service.IContainerService;
 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
@@ -17,10 +19,13 @@ import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.quartz.PersistJobDataAfterExecution;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 /**
@@ -39,18 +44,29 @@ public class WcsTask implements Job {
     @Resource
     private IHuahengMultiHandlerService huahengMultiHandlerService;
+    @Resource
+    private IContainerService containerService;
+
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         log.info(String.format(" WcsTask 执行任务! 时间:" + DateUtils.getTimestamp()));
         LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD).eq(TaskHeader::getAgvTaskId, 0);
+        taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD).eq(TaskHeader::getAgvTaskId, 0)
+            .ge(TaskHeader::getCreateTime, DateUtil.offsetDay(new Date(), -180)).orderByAsc(TaskHeader::getCreateTime);
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-        for (TaskHeader taskHeader : taskHeaderList) {
-            try {
-                huahengMultiHandlerService.sendTaskToWcs(taskHeader);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        if (CollectionUtils.isEmpty(taskHeaderList)) {
+            return;
         }
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper.in(Container::getCode, taskHeaderList.stream().map(TaskHeader::getContainerCode).collect(Collectors.toList()));
+        List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
+        Map<String, String> containerZoneCodeMap = containerList.stream().collect(Collectors.toMap(Container::getCode, Container::getZoneCode));
+        Map<String, List<TaskHeader>> groupeTaskHeaders =
+            taskHeaderList.stream().collect(Collectors.groupingBy(taskHeader -> StringUtils.isEmpty(containerZoneCodeMap.get(taskHeader.getContainerCode()))
+                ? QuantityConstant.DEFAULT_ZONE_CODE : containerZoneCodeMap.get(taskHeader.getContainerCode())));
+        // 循环 groupedTaskHeaders 中的每个键值对
+        groupeTaskHeaders.forEach((zoneCode, taskHeaders) -> {
+            huahengMultiHandlerService.sendTaskToWcs(taskHeaders, taskHeaders.get(0).getWarehouseCode(), zoneCode);
+        });
     }
 }
@@ -226,6 +226,9 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
             receiptDetail1.setId(receiptDetail.getId());
             receiptDetail1.setTaskQty(receiptTaskQty);
             receiptDetail1.setStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
+            if (receiptTaskQty.equals(receiptQty)) {
+                receiptDetail1.setStatus(QuantityConstant.RECEIPT_HEADER_WAIT_SHELF);
+            }
             receiptDetailList.add(receiptDetail1);
             LambdaQueryWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -87,8 +87,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     private ITaskDetailService taskDetailService;
     @Autowired
     private IInventoryHeaderService inventoryHeaderService;
-    @Resource
-    private IHuahengMultiHandlerService huahengMultiHandlerService;
     /**
      * 根据出库单详情，匹配到可用出库的库存详情
@@ -77,10 +77,13 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
     @Autowired
     private IShipmentDetailService shipmentDetailService;
+
     @Resource
     private IErpService erpService;
+
     @Resource
     private IInventoryDetailService inventoryDetailService;
+
     @Resource
     private IHuahengMultiHandlerService huahengMultiHandlerService;
@@ -120,6 +123,14 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
         return shipmentHeaderService.saveShipmentHeader(shipmentHeader);
     }
+    @AutoLog(value = "出库单-单据合并")
+    @ApiOperation(value = "出库单-单据合并", notes = "出库单-单据合并")
+    @PostMapping(value = "/mergeShipment")
+    @RequiresPermissions("shipmentHeader:mergeShipment")
+    public Result<?> mergeShipment(@RequestBody List<ShipmentHeader> shipmentHeaderList, HttpServletRequest req) {
+        return shipmentHeaderService.mergeShipment(shipmentHeaderList);
+    }
+
     /**
      * 编辑
      * @param  shipmentHeader
@@ -40,6 +40,10 @@ public class ShipmentDetail implements Serializable {
     @Excel(name = "出库单编码", width = 15)
     @ApiModelProperty(value = "出库单编码")
     private String shipmentCode;
+    /** 合并出库单编码 */
+    @Excel(name = "合并出库单编码", width = 15)
+    @ApiModelProperty(value = "合并出库单编码")
+    private String mergeShipmentCode;
     /** 仓库编码 */
     @Excel(name = "仓库编码", width = 15)
     @ApiModelProperty(value = "仓库编码")
@@ -34,6 +34,10 @@ public class ShipmentHeader implements Serializable {
     @Excel(name = "出库单编码", width = 15)
     @ApiModelProperty(value = "出库单编码")
     private String code;
+    /** 合并出库单编码 */
+    @Excel(name = "合并出库单编码", width = 15)
+    @ApiModelProperty(value = "合并出库单编码")
+    private String mergeShipmentCode;
     /** 仓库编码 */
     @Excel(name = "仓库编码", width = 15)
     @ApiModelProperty(value = "仓库编码")
@@ -2,6 +2,7 @@ package org.jeecg.modules.wms.shipment.shipmentHeader.service;
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.List;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
@@ -39,4 +40,6 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
     public ShipmentHeader getShipmentHeaderByReferCode(String referCode, String warehouseCode);
     boolean updateFirstStatusAndLastStatusById(Integer firstStatus, Integer lastStatus, int id);
+
+    public Result<Object> mergeShipment(List<ShipmentHeader> shipmentHeaderList);
 }
@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -31,8 +32,10 @@ import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,26 +53,37 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     @Autowired
     private ShipmentHeaderMapper shipmentHeaderMapper;
+
     @Autowired
     private ShipmentDetailMapper shipmentDetailMapper;
+
     @Resource
     private IShipmentTypeService shipmentTypeService;
+
     @Resource
     private IShipmentHeaderService shipmentHeaderService;
+
     @Resource
     private IShipmentDetailService shipmentDetailService;
+
     @Resource
     private IShipmentContainerDetailService shipmentContainerDetailService;
+
     @Resource
     private ILocationService locationService;
+
     @Resource
     private IContainerService containerService;
+
     @Resource
     private ITaskHeaderService taskHeaderService;
+
     @Resource
     private IInventoryDetailService inventoryDetailService;
+
     @Resource
     private IParameterConfigurationService parameterConfigurationService;
+
     @Resource
     private IShipmentHeaderHistoryService shipmentHeaderHistoryService;
@@ -114,12 +128,12 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         if (StringUtils.isNotEmpty(referCode)) {
             ShipmentHeader referShipmentHeader = getShipmentHeaderByReferCode(referCode, warehouseCode);
             if (referShipmentHeader != null) {
-                return Result.error("上游单号" + referCode + ",已经存在");
+                return Result.error("上游单号：" + referCode + "，已经存在");
             }
         }
         String code = createCode(shipmentHeader.getType());
         if (StringUtils.isEmpty(code)) {
-            throw new JeecgBootException("根据出库单类型" + shipmentHeader.getType() + "生成单号失败");
+            throw new JeecgBootException("根据出库单类型：" + shipmentHeader.getType() + "，生成单号失败");
         }
         shipmentHeader.setCode(code);
         shipmentHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
@@ -138,8 +152,8 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         Date now = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
         LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getType, shipmentType).select(ShipmentHeader::getCode).orderByDesc(ShipmentHeader::getId)
-            .last("Limit 1");
+        shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getType, shipmentType).likeRight(ShipmentHeader::getCode, shipmentType).select(ShipmentHeader::getCode)
+            .orderByDesc(ShipmentHeader::getId).last("Limit 1");
         String maxCode = null;
         ShipmentHeader shipmentHeader = this.getOne(shipmentHeaderLambdaQueryWrapper);
         if (shipmentHeader != null) {
@@ -245,4 +259,78 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         return success;
     }
+    @Override
+    @Transactional
+    public Result<Object> mergeShipment(List<ShipmentHeader> shipmentHeaderList) {
+        if (CollectionUtils.isEmpty(shipmentHeaderList)) {
+            return Result.error("至少选择两条记录！");
+        }
+        // 查询出库单头信息
+        LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        shipmentHeaderLambdaQueryWrapper.in(ShipmentHeader::getCode, shipmentHeaderList.stream().map(ShipmentHeader::getCode).collect(Collectors.toList()));
+        List<ShipmentHeader> mergeShipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
+        if (shipmentHeaderList.size() != mergeShipmentHeaderList.size()) {
+            return Result.error("未知错误！");
+        }
+        if (mergeShipmentHeaderList.size() < 2) {
+            return Result.error("至少选择两条有效记录！");
+        }
+        if (mergeShipmentHeaderList.stream().map(ShipmentHeader::getWarehouseCode).distinct().count() > 1) {
+            return Result.error("仓库信息不一致！");
+        }
+        if (mergeShipmentHeaderList.stream().map(ShipmentHeader::getCompanyCode).distinct().count() > 1) {
+            return Result.error("货主信息不一致！");
+        }
+        if (mergeShipmentHeaderList.stream().map(ShipmentHeader::getType).distinct().count() > 1) {
+            return Result.error("出库单类型信息不一致！");
+        }
+        if (mergeShipmentHeaderList.stream().map(ShipmentHeader::getCustomerCode).distinct().count() > 1) {
+            return Result.error("客户信息不一致！");
+        }
+        // 查询出库单详情
+        LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        shipmentDetailLambdaQueryWrapper.in(ShipmentDetail::getShipmentCode, shipmentHeaderList.stream().map(ShipmentHeader::getCode).collect(Collectors.toList()));
+        List<ShipmentDetail> mergeshipmentDetailList = shipmentDetailService.list(shipmentDetailLambdaQueryWrapper);
+
+        ShipmentHeader mergeShipmentHeader = new ShipmentHeader();
+        mergeShipmentHeader.setCode(this.createCode(mergeShipmentHeaderList.get(0).getType()));
+        mergeShipmentHeader.setWarehouseCode(mergeShipmentHeaderList.get(0).getWarehouseCode());
+        mergeShipmentHeader.setType(mergeShipmentHeaderList.get(0).getType());
+        mergeShipmentHeader.setCompanyCode(mergeShipmentHeaderList.get(0).getCompanyCode());
+        mergeShipmentHeader.setCustomerCode(mergeShipmentHeaderList.get(0).getCustomerCode());
+        mergeShipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
+        mergeShipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
+        mergeShipmentHeader.setTotalQty(mergeshipmentDetailList.stream().map(ShipmentDetail::getQty).reduce(BigDecimal.ZERO, BigDecimal::add));
+        mergeShipmentHeader.setTotalLines(mergeshipmentDetailList.size());
+        mergeShipmentHeader.setRemark("合并单据");
+        if (!save(mergeShipmentHeader)) {
+            throw new JeecgBootException("新增合并出库单主表失败");
+        }
+        mergeshipmentDetailList.stream().forEach(t -> {
+            t.setId(null);
+            t.setShipmentId(mergeShipmentHeader.getId());
+            t.setShipmentCode(mergeShipmentHeader.getCode());
+        });
+        if (!shipmentDetailService.saveBatch(mergeshipmentDetailList)) {
+            throw new JeecgBootException("新增合并出库单详情失败");
+        }
+        // 更新原单据头信息为已合并，关联合并出库单号
+        LambdaUpdateWrapper<ShipmentHeader> shipmentHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        shipmentHeaderLambdaUpdateWrapper.in(ShipmentHeader::getCode, shipmentHeaderList.stream().map(ShipmentHeader::getCode).collect(Collectors.toList()));
+        shipmentHeaderLambdaUpdateWrapper.set(ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_MERGED)
+            .set(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_MERGED).set(ShipmentHeader::getMergeShipmentCode, mergeShipmentHeader.getCode());
+        if (!shipmentHeaderService.update(shipmentHeaderLambdaUpdateWrapper)) {
+            throw new JeecgBootException("更新出库单主表失败");
+        }
+
+        // 更新原单据详情信息为已合并，关联合并出库单号
+        LambdaUpdateWrapper<ShipmentDetail> shipmentDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        shipmentDetailLambdaUpdateWrapper.in(ShipmentDetail::getShipmentCode, shipmentHeaderList.stream().map(ShipmentHeader::getCode).collect(Collectors.toList()));
+        shipmentDetailLambdaUpdateWrapper.set(ShipmentDetail::getStatus, QuantityConstant.SHIPMENT_HEADER_MERGED).set(ShipmentDetail::getMergeShipmentCode,
+            mergeShipmentHeader.getCode());
+        if (!shipmentDetailService.update(shipmentDetailLambdaUpdateWrapper)) {
+            throw new JeecgBootException("更新出库单主表失败");
+        }
+        return Result.OK("合并成功");
+    }
 }
@@ -387,8 +387,8 @@ public class TaskHeaderController extends HuahengBaseController {
         if (taskHeader == null) {
             return Result.error("taskHeader不能为空");
         }
-        Result result = huahengMultiHandlerService.sendTaskToWcs(taskHeader);
-        return result;
+        Container container = containerService.getContainerByCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode());
+        return huahengMultiHandlerService.sendTaskToWcs(taskHeader, container == null ? QuantityConstant.DEFAULT_ZONE_CODE : container.getZoneCode());
     }
     /**
@@ -844,7 +844,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("取消任务失败，有前置任务" + preTaskHeader.getId());
         }
         if (!taskHeaderService.removeById(taskId)) {
-            throw new JeecgBootException("取消任务失败, 删除任务失败");
+            throw new JeecgBootException("取消任务失败， 删除任务失败");
         }
         List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskId);
         if (taskDetailList.size() > 0) {
@@ -872,6 +872,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 throw new JeecgBootException(result.getMessage());
             }
         }
+        if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(taskHeader.getContainerCode(), taskHeader.getWarehouseCode())) {
+            throw new JeecgBootException("取消任务失败， 更新库存明细失败");
+        }
         log.info("完成取消任务" + taskHeader.getId());
         return result;
     }
@@ -108,6 +108,9 @@ public class QuantityConstant {
     // 过账
     public static final Integer SHIPMENT_HEADER_COMPLETED = 800;
+    
+    // 已合并
+    public static final Integer SHIPMENT_HEADER_MERGED = 810;
     // 回传失败
     public static final Integer SHIPMENT_HEADER_RETURN_ERROR = 850;
@@ -616,4 +619,7 @@ public class QuantityConstant {
      * 受控，受控的库存详情不能出库
      */
     public static final int CONTROLLER_ENABLE = 1;
+    
+    /** 默认库区编码 */
+    public static final String DEFAULT_ZONE_CODE = "Default";
 }
@@ -58,11 +58,11 @@
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>
-    <logger name="jdbc.sqlonly" additivity="false" level="info">
+    <logger name="jdbc.sqlonly" additivity="false" level="off">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>
-    <logger name="jdbc.sqltiming" additivity="false" level="off">
+    <logger name="jdbc.sqltiming" additivity="false" level="info">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="FILE" />
     </logger>