1. 路径指引

2. 打印拣货单 3. 增加培训计划

1. 路径指引
2. 打印拣货单 3. 增加培训计划
肖超群
1 parent cbd7786d
Showing 27 changed files with 267 additions and 33 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
ant-design-vue-jeecg/src/views/system/inventory/modules/QualityInventoryDetailModal.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerAdviceList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentManualCombineModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.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/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/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.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/shipmentContainerAdvice/controller/ShipmentContainerAdviceController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerAdvice/entity/ShipmentContainerAdvice.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerAdvice/service/IShipmentContainerAdviceService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerAdvice/service/impl/ShipmentContainerAdviceServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.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/ShipmentHeader.java
@@ -151,6 +151,8 @@ export const autoCombination = (params) =&gt; postAction(&#39;/shipment/shipmentCombina
 export const autoShipment = (params) => postAction('/shipment/shipmentHeader/autoShipment', params);
 //自动预配盘出库
 export const autoShipmentAdvice = (params) => postAction('/shipment/shipmentHeader/autoShipmentAdvice', params);
+//平库路径指引
+export const autoFlatShipmentAdvice = (params) => postAction('/shipment/shipmentHeader/autoFlatShipmentAdvice', params);
 //根据序列号扣减预配盘的库存
 export const reduceInventoryDetailBySn = (params) => postAction('/shipment/shipmentCombination/reduceInventoryDetailBySn?snList=' + params, params);
 //创建出库任务
@@ -315,7 +315,7 @@ export default {
         for (var a = 0; a < this.selectedRowKeys.length; a++) {
           ids += this.selectedRowKeys[a] + ",";
         }
-        window.open(window._CONFIG['domianURL'] + "/jmreport/view/963689682890440704/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
+        window.open(window._CONFIG['domianURL'] + "/jmreport/view/897299074078208000/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
       }
     },
     doubleBarCodePrint() {
@@ -87,7 +87,9 @@ export default {
       selectPickPort(this.querySource).then(res => {
         if (res.success) {
           this.portList = res.result
-          this.visible = true
+          if (this.portList.length == 1) {
+            this.model.outPortCode = this.portList[0].code;
+          }
         }
       })
     },
@@ -125,16 +125,16 @@
         </template>
  
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a v-if="record.status == 0" @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-menu-item >
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item v-if="record.status == 0">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
@@ -61,7 +61,7 @@
         </span>
  
         <span slot="action" slot-scope="text, record">
-          <a v-if=" (flowStatus == '15' && flowStatus != '20' && record.status < 800) || (flowOff == '0' && record.status < 800)" @click="combine(record)">配盘</a>
+          <a v-has="'shipmentDetail:combine'" v-if=" (flowStatus == '15' && flowStatus != '20' && record.status < 800) || (flowOff == '0' && record.status < 800)" @click="combine(record)">配盘</a>
           <a v-has="'shipmentDetail:edit'" v-if="record.status == 0 && record.referCode == null" @click="handleEdit(record)"><a-divider type="vertical"/>编辑</a>
           <a-popconfirm v-has="'shipmentDetail:delete'" v-if="record.status == 0 && record.referCode == null" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a-divider type="vertical"/><a>删除</a>
@@ -215,7 +215,7 @@
           </a-popconfirm>
           <a v-show="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button></a>
                     <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0))
-            || (flowOff == '0' && record.lastStatus < 800 && record.totalLines != 0)" @click="manualShipmentCombine(record.id)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">手动配盘</a-button></a>
+            || (flowOff == '0' && record.lastStatus < 800 && record.totalLines != 0)" @click="manualShipmentCombine(record.id)" v-has="'shipmentHeader:combine'"><a-button type="primary">手动配盘</a-button></a>
           <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0))
             || (flowOff == '0' && record.lastStatus < 800 && record.totalLines != 0)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button></a>
           <a-dropdown v-if="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1')
@@ -227,12 +227,18 @@
               <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-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800) && record.totalLines != 0  || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0)" v-has="'shipmentHeader:autoShipment'">
+              <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0  && record.zoneType == 'L' )  || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0 && record.zoneType == 'L')" v-has="'shipmentHeader:autoShipment'">
                 <a @click="autoShipment(record)" type="primary">自动出库</a>
               </a-menu-item>
-              <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0) || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0)" v-has="'shipmentHeader:autoShipmentAdvice'">
+              <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0  && record.zoneType == 'L' ) || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0 && record.zoneType == 'L')" v-has="'shipmentHeader:autoShipmentAdvice'">
                 <a @click="autoShipmentAdvice(record)"  type="primary">预配盘出库</a>
               </a-menu-item>
+              <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0  && record.zoneType == 'P' ) || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0 && record.zoneType == 'P')" v-has="'shipmentHeader:autoShipmentAdvice'">
+                <a @click="autoFlatShipmentAdvice(record)"  type="primary">路径指引</a>
+              </a-menu-item>
+              <a-menu-item v-if="(record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800 && record.totalLines != 0  && record.zoneType == 'P' ) || (flowOff == '0' && record.lastStatus <= 200 && record.totalLines != 0 && record.zoneType == 'P')" v-has="'shipmentHeader:print'">
+                <a @click="print(record)"  type="primary">打印拣货单</a>
+              </a-menu-item>
               <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>
@@ -269,7 +275,7 @@ import {downFile, getAction} from &#39;@/api/manage&#39;
 import ShipmentDetailList from './ShipmentDetailList'
 import {initDictOptions, filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import '@/assets/less/TableExpand.less'
-import {getCompanyList, backErpShipment, getZoneList} from '@/api/api'
+import {getCompanyList, backErpShipment, getZoneList, autoFlatShipmentAdvice} from '@/api/api'
 import {getShipmentTypeList} from '@/api/api'
 import {getCustomerList} from '@/api/api'
 import {autoCombination} from '@/api/api'
@@ -616,6 +622,16 @@ export default {
         window.open(window._CONFIG['domianURL'] + "/jmreport/view/770140222517493760/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
       }
     },
+    print(record) {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！');
+        return;
+      } else {
+        var ids = "";
+        ids = this.selectedRowKeys[0];
+        window.open(window._CONFIG['domianURL'] + "/jmreport/view/973383742890766336/?id=" + ids, "newWindow", "toolbar=no,scrollbars=no,menubar=no,screenX=100,screenY=100");
+      }
+    },
     solutionCompany(value) {
       var actions = []
       Object.keys(this.companyList).some((key) => {
@@ -701,6 +717,18 @@ export default {
         this.searchQuery();
       });
     },
+    autoFlatShipmentAdvice(record) {
+      this.loading = true;
+      autoFlatShipmentAdvice(record).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message);
+        } else {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+        this.searchQuery();
+      });
+    },
     dataSearch(){
       //加载数据 若传入参数1则加载第一页的内容
       var params = this.getQueryParams();//查询条件
@@ -296,6 +296,7 @@ export default {
       return actions.join('')
     },
     handleOk() {
+      this.$emit('ok');
       this.close();
     },
     onSelectChange(selectedRowKeys, selectionRows) {
@@ -24,6 +24,8 @@ import org.jeecg.modules.wms.config.supplier.entity.Supplier;
 import org.jeecg.modules.wms.config.supplier.service.ISupplierService;
 import org.jeecg.modules.wms.config.warehouse.entity.Warehouse;
 import org.jeecg.modules.wms.config.warehouse.service.IWarehouseService;
+import org.jeecg.modules.wms.config.zone.entity.Zone;
+import org.jeecg.modules.wms.config.zone.service.IZoneService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
@@ -76,6 +78,8 @@ public class ErpServiceImpl implements IErpService {
     private ISupplierService supplierService;
     @Resource
     private ICustomerService customerService;
+    @Resource
+    private IZoneService zoneService;
  
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -277,11 +281,20 @@ public class ErpServiceImpl implements IErpService {
             }
             customerName = customer.getName();
         }
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(zoneCode)) {
+            Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setWarehouseCode(warehouseCode);
         shipmentHeader.setCompanyCode(companyCode);
         shipmentHeader.setCustomerName(customerName);
         shipmentHeader.setZoneCode(zoneCode);
+        shipmentHeader.setZoneType(zoneType);
         shipmentHeader.setType(shipmentType);
         shipmentHeader.setReferCode(referCode);
         shipmentHeader.setCustomerCode(customerCode);
@@ -498,11 +498,11 @@ public class WcsServiceImpl implements WcsService {
                     if (unCompleteTaskHeader != null) {
                         return Result.error("任务下发, 执行外侧库位出库时，相应的内侧库位有入库类型任务，请先执行完内侧库位任务");
                     }
-                    // 如果是有任务，从这个库位出托盘，那么等这个任务作为前置任务。
-                    unCompleteTaskHeader = taskHeaderService.getUnCompleteTaskByFromLocationCode(insideLocationCode, warehouseCode);
-                    if (unCompleteTaskHeader != null) {
-                        preTaskNo = unCompleteTaskHeader.getId();
-                    }
+//                    // 如果是有任务，从这个库位出托盘，那么等这个任务作为前置任务。
+//                    unCompleteTaskHeader = taskHeaderService.getUnCompleteTaskByFromLocationCode(insideLocationCode, warehouseCode);
+//                    if (unCompleteTaskHeader != null) {
+//                        preTaskNo = unCompleteTaskHeader.getId();
+//                    }
                 }
                 taskHeader.setPreTaskNo(preTaskNo);
                 boolean success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId());
@@ -31,6 +31,11 @@ public interface IHuahengMultiHandlerService {
     Result cancelCombine(Integer id);
  
     /**
+     * 取消预配盘
+     */
+    Result cancelCombineAdvice(Integer id);
+
+    /**
      * 取消组盘
      */
     Result cancelReceiving(Integer id);
@@ -39,6 +44,8 @@ public interface IHuahengMultiHandlerService {
  
     Result autoShipmentAdvice(String shipmentCode, String warehouseCode);
  
+    Result autoFlatShipmentAdvice(String shipmentCode, String warehouseCode);
+
     Result autoShipment(String shipmentCode, String warehouseCode);
  
     Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber);
@@ -35,6 +35,7 @@ import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.FlatShipment;
 import org.jeecg.modules.wms.shipment.shipmentCombination.service.IShipmentCombinationService;
+import org.jeecg.modules.wms.shipment.shipmentContainerAdvice.service.IShipmentContainerAdviceService;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerHeaderService;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
@@ -97,6 +98,8 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     private IContainerService containerService;
     @Resource
     private ILocationService locationService;
+    @Resource
+    private IShipmentContainerAdviceService shipmentContainerAdviceService;
  
     @Override
     public Result sendTaskToWcs(TaskHeader taskHeader, String zoneCode) {
@@ -161,6 +164,7 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
         shipmentHeader.setWarehouseCode(warehouseCode);
         shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
         shipmentHeader.setZoneCode(QuantityConstant.ZONE_TYPE_FLAT);
+        shipmentHeader.setZoneType(QuantityConstant.ZONE_TYPE_FLAT);
         shipmentHeader.setCompanyCode(inventoryDetailList.get(0).getCompanyCode());
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
         if (!result.isSuccess()) {
@@ -344,6 +348,18 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     }
  
     @Override
+    public Result cancelCombineAdvice(Integer id) {
+        Result result = handleMultiProcess("cancelCombineAdvice", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = shipmentContainerAdviceService.cancelCombineAdvice(id);
+                return result;
+            }
+        });
+        return result;
+    }
+
+    @Override
     public Result cancelReceiving(Integer id) {
         Result result = handleMultiProcess("cancelReceiving", new MultiProcessListener() {
             @Override
@@ -380,6 +396,18 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     }
  
     @Override
+    public Result autoFlatShipmentAdvice(String shipmentCode, String warehouseCode) {
+        Result result = handleMultiProcess("combination", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = shipmentHeaderService.autoFlatShipmentAdvice(shipmentCode, warehouseCode);
+                return result;
+            }
+        });
+        return result;
+    }
+
+    @Override
     public Result autoShipment(String shipmentCode, String warehouseCode) {
         Result result = handleMultiProcess("combination", new MultiProcessListener() {
             @Override
@@ -217,11 +217,20 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (StringUtils.isEmpty(inventoryDetails)) {
             return Result.error("批量快速出库, 排除锁定库存后没有可出库存详情");
         }
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(zoneCode)) {
+            Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
         String companyCode = inventoryDetails.get(0).getCompanyCode();
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setWarehouseCode(warehouseCode);
         shipmentHeader.setCompanyCode(companyCode);
         shipmentHeader.setZoneCode(zoneCode);
+        shipmentHeader.setZoneType(zoneType);
         shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
         shipmentHeader.setRemark("快速出库");
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
@@ -312,11 +321,20 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (StringUtils.isEmpty(inventoryDetailList)) {
             return Result.error("批量快速出库, 排除锁定库存后没有可出库存详情");
         }
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(zoneCode)) {
+            Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
         String companyCode = inventoryDetailList.get(0).getCompanyCode();
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setWarehouseCode(warehouseCode);
         shipmentHeader.setCompanyCode(companyCode);
         shipmentHeader.setZoneCode(zoneCode);
+        shipmentHeader.setZoneType(zoneType);
         shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
         shipmentHeader.setRemark("快速出库");
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
@@ -793,7 +793,8 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             shipmentContainerAdvice.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
             shipmentContainerAdvice.setCompanyCode(shipmentDetail.getCompanyCode());
             shipmentContainerAdvice.setContainerCode(shipmentContainerHeader.getContainerCode());
-//            shipmentContainerAdvice.setInventoryDetailId(inventoryDetail.getId());
+            shipmentContainerAdvice.setLocationCode(shipmentContainerHeader.getFromLocationCode());
+            shipmentContainerAdvice.setInventoryDetailId(inventoryDetail.getId());
             shipmentContainerAdvice.setShipmentCode(shipmentDetail.getShipmentCode());
             shipmentContainerAdvice.setShipmentId(shipmentDetail.getShipmentId());
             shipmentContainerAdvice.setShipmentDetailId(shipmentDetail.getId());
@@ -93,8 +93,8 @@ public class ShipmentContainerAdviceController extends JeecgController&lt;ShipmentC
     @ApiOperation(value = "出库预配盘-通过id删除", notes = "出库预配盘-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        shipmentContainerAdviceService.removeById(id);
-        return Result.OK("删除成功!");
+        Result result = shipmentContainerAdviceService.cancelFlatCombineAdvice(Integer.parseInt(id));
+        return result;
     }
  
     /**
@@ -106,7 +106,10 @@ public class ShipmentContainerAdviceController extends JeecgController&lt;ShipmentC
     @ApiOperation(value = "出库预配盘-批量删除", notes = "出库预配盘-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.shipmentContainerAdviceService.removeByIds(Arrays.asList(ids.split(",")));
+        List<String> idList = Arrays.asList(ids.split(","));
+        for (String id : idList) {
+            shipmentContainerAdviceService.cancelFlatCombineAdvice(Integer.parseInt(id));
+        }
         return Result.OK("批量删除成功!");
     }
  
@@ -42,14 +42,14 @@ public class ShipmentContainerAdvice implements Serializable {
     @Excel(name = "容器编码", width = 15)
     @ApiModelProperty(value = "容器编码")
     private java.lang.String containerCode;
-//    /** 库位编码 */
-//    @Excel(name = "库位编码", width = 15)
-//    @ApiModelProperty(value = "库位编码")
-//    private java.lang.String locationCode;
-//    /** 库存明细id */
-//    @Excel(name = "库存明细id", width = 15)
-//    @ApiModelProperty(value = "库存明细id")
-//    private java.lang.Integer inventoryDetailId;
+    /** 库位编码 */
+    @Excel(name = "库位编码", width = 15)
+    @ApiModelProperty(value = "库位编码")
+    private java.lang.String locationCode;
+    /** 库存明细id */
+    @Excel(name = "库存明细id", width = 15)
+    @ApiModelProperty(value = "库存明细id")
+    private java.lang.Integer inventoryDetailId;
     /** 出库配盘ID */
     @Excel(name = "出库配盘ID", width = 15)
     @ApiModelProperty(value = "出库配盘ID")
@@ -23,10 +23,16 @@ public interface IShipmentContainerAdviceService extends IService&lt;ShipmentContai
     boolean updateTaskQtyById(BigDecimal qty, int id);
  
     /**
-     * 取消配盘
+     * 取消预配盘
      * @return
      */
-    Result cancelCombine(Integer id);
+    Result cancelCombineAdvice(Integer id);
+
+    /**
+     * 取消平库预配盘
+     * @return
+     */
+    Result cancelFlatCombineAdvice(Integer id);
  
     List<ShipmentContainerAdvice> getShipmentContainerAdviceListByShipmentCode(String shipmentCode, String warehouseCode);
  
@@ -98,10 +98,10 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result cancelCombine(Integer id) {
+    public Result cancelCombineAdvice(Integer id) {
         log.info("开始取消预配盘,id:" + id);
         ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id);
-        if (shipmentContainerHeader == null) {
+        if (shipmentContainerHeader != null) {
             return Result.error("取消出库预配盘失败, 没有找到出库组盘头ID：" + id);
         }
         int status = shipmentContainerHeader.getStatus();
@@ -143,6 +143,37 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
     }
  
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result cancelFlatCombineAdvice(Integer id) {
+        log.info("开始取消预配盘,id:" + id);
+        ShipmentContainerAdvice shipmentContainerAdvice = shipmentContainerAdviceService.getById(id);
+        if (shipmentContainerAdvice == null) {
+            return Result.error("取消出库预配盘失败，没有找到预配盘" + id);
+        }
+        if (shipmentContainerAdvice.getStatus().intValue() != QuantityConstant.SHIPMENT_CONTAINER_BUILD) {
+            return Result.error("取消出库预配盘失败，预配盘id" + id);
+        }
+        ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentContainerAdvice.getShipmentDetailId());
+        BigDecimal taskQty = shipmentDetail.getTaskQty().subtract(shipmentContainerAdvice.getQty());
+        shipmentDetail.setTaskQty(taskQty);
+        if (!shipmentDetailService.updateTaskQtyAndStatusById(taskQty, QuantityConstant.SHIPMENT_HEADER_BUILD, shipmentDetail.getId())) {
+            throw new JeecgBootException("取消出库预配盘失败, 更新出库明细失败，出库详情ID：" + shipmentContainerAdvice.getShipmentDetailId());
+        }
+        if (!shipmentContainerAdviceService.removeById(shipmentContainerAdvice.getId())) {
+            throw new JeecgBootException("取消出库预配盘失败， 删除出库组盘明细表失败，配盘详情ID：" + shipmentContainerAdvice.getId());
+        }
+        if (!shipmentHeaderService.updateShipmentHeaderStatus(shipmentDetail.getShipmentId())) {
+            throw new JeecgBootException("取消出库预配盘失败, 更新出库单头失败，出库单ID：" + shipmentDetail.getShipmentId());
+        }
+        InventoryDetail inventoryDetail = inventoryDetailService.getById(shipmentContainerAdvice.getInventoryDetailId());
+        if (!inventoryDetailService.updateTaskQtyById(BigDecimal.ZERO, inventoryDetail.getId())) {
+            throw new JeecgBootException("取消出库预配盘失败, 解锁库存详情失败，库存详情ID：" + inventoryDetail.getId());
+        }
+        log.info("完成取消预配盘,id:" + id);
+        return Result.ok("取消预配盘成功");
+    }
+
+    @Override
     public List<ShipmentContainerAdvice> getShipmentContainerAdviceListByShipmentCode(String shipmentCode, String warehouseCode) {
         LambdaQueryWrapper<ShipmentContainerAdvice> shipmentContainerAdviceLambdaQueryWrapper = Wrappers.lambdaQuery();
         shipmentContainerAdviceLambdaQueryWrapper.eq(ShipmentContainerAdvice::getShipmentCode, shipmentCode)
@@ -211,7 +211,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                     throw new JeecgBootException("取消出库任务时, 取消配盘失败");
                 }
             } else {
-                Result result = shipmentContainerAdviceService.cancelCombine(shipmentContainerHeader.getId());
+                Result result = shipmentContainerAdviceService.cancelCombineAdvice(shipmentContainerHeader.getId());
                 if (!result.isSuccess()) {
                     throw new JeecgBootException("取消出库任务时, 取消配盘失败");
                 }
@@ -460,6 +460,17 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
         return result;
     }
  
+    @AutoLog(value = "平库路径指引")
+    @ApiOperation(value = "平库路径指引", notes = "平库路径指引")
+    @PostMapping("/autoFlatShipmentAdvice")
+    @ResponseBody
+    public Result<TaskHeader> autoFlatShipmentAdvice(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        String shipmentCode = shipmentHeader.getCode();
+        Result result = huahengMultiHandlerService.autoFlatShipmentAdvice(shipmentCode, warehouseCode);
+        return result;
+    }
+
     /**
      * 获取出库单物料库存信息
      * @return
@@ -47,6 +47,10 @@ public class ShipmentHeader implements Serializable {
     @Excel(name = "库区", width = 15)
     @ApiModelProperty(value = "库区")
     private String zoneCode;
+    /** 库区类型 */
+    @Excel(name = "库区类型", width = 15)
+    @ApiModelProperty(value = "库区类型")
+    private String zoneType;
     /** 货主编码 */
     @Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
@@ -52,6 +52,8 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
  
     Result autoShipmentAdvice(String shipmentCode, String warehouseCode);
  
+    Result autoFlatShipmentAdvice(String shipmentCode, String warehouseCode);
+
     Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList);
  
     Result updateShipmentHeader(ShipmentDetail shipmentDetail);
@@ -175,6 +175,14 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         if (zoneByCode == null) {
             throw new JeecgBootException("库区：" + zoneCodeList.get(0) + "不存在");
         }
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(zoneCodeList.get(0))) {
+            Zone zone = zoneService.getZoneByCode(zoneCodeList.get(0), QuantityConstant.DEFAULT_WAREHOUSE);
+            if (zone == null) {
+                throw new JeecgBootException("出库单导入失败， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
         BigDecimal totalQty = shipmentDetailList.stream().map(i -> i.getQty()).reduce(BigDecimal.ZERO, BigDecimal::add);
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setWarehouseCode(QuantityConstant.DEFAULT_WAREHOUSE);
@@ -225,8 +225,18 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
             }
             customerName = customer.getName();
         }
+        String zoneCode = shipmentHeader.getZoneCode();
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(zoneCode)) {
+            Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区信息");
+            }
+            zoneType = zone.getType();
+        }
         shipmentHeader.setCustomerName(customerName);
         shipmentHeader.setCode(code);
+        shipmentHeader.setZoneType(zoneType);
         shipmentHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
         shipmentHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
         boolean result = save(shipmentHeader);
@@ -384,6 +394,15 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         shipmentDetailLambdaQueryWrapper.in(ShipmentDetail::getShipmentCode, shipmentHeaderList.stream().map(ShipmentHeader::getCode).collect(Collectors.toList()));
         List<ShipmentDetail> mergeshipmentDetailList = shipmentDetailService.list(shipmentDetailLambdaQueryWrapper);
  
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(mergeShipmentHeaderList.get(0).getZoneCode())) {
+            Zone zone = zoneService.getZoneByCode(mergeShipmentHeaderList.get(0).getZoneCode(), mergeShipmentHeaderList.get(0).getWarehouseCode());
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
+
         ShipmentHeader mergeShipmentHeader = new ShipmentHeader();
         mergeShipmentHeader.setZoneCode(mergeShipmentHeaderList.get(0).getZoneCode());
         mergeShipmentHeader.setCode(this.createCode(mergeShipmentHeaderList.get(0).getType()));
@@ -616,13 +635,62 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
  
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public Result autoFlatShipmentAdvice(String shipmentCode, String warehouseCode) {
+        if (StringUtils.isEmpty(shipmentCode)) {
+            return Result.error("自动预配盘出库, 出库单编码为空");
+        }
+        if (StringUtils.isEmpty(warehouseCode)) {
+            return Result.error("自动预配盘出库, 仓库编码为空");
+        }
+        ShipmentHeader shipmentHeader = shipmentHeaderService.getShipmentHeaderByCode(shipmentCode, warehouseCode);
+        if (shipmentHeader == null) {
+            throw new JeecgBootException("自动预配盘出库, 没有找到出库单");
+        }
+        String zoneCode = shipmentHeader.getZoneCode();
+        if (StringUtils.isEmpty(zoneCode)) {
+            throw new JeecgBootException("自动预配盘出库, 库区编码为空");
+        }
+        Zone zone = zoneService.getZoneByCode(zoneCode, warehouseCode);
+        if (zone == null) {
+            throw new JeecgBootException("自动预配盘出库, 库区为空");
+        }
+        String zoneType = zone.getType();
+        if (StringUtils.isEmpty(zoneType)) {
+            throw new JeecgBootException("自动预配盘出库, 库区类型编码为空");
+        }
+        if (!zoneType.equals(QuantityConstant.ZONE_TYPE_FLAT)) {
+            throw new JeecgBootException("自动预配盘出库, 库区类型必须为平库区类型");
+        }
+        Result result = shipmentCombinationService.autoCombination(shipmentCode, true, warehouseCode);
+        if (!result.isSuccess()) {
+            throw new JeecgBootException("自动预配盘出库，" + result.getMessage());
+        }
+        List<ShipmentContainerAdvice> shipmentContainerAdviceList =
+            shipmentContainerAdviceService.getShipmentContainerAdviceListByShipmentCode(shipmentCode, warehouseCode);
+        if (CollectionUtils.isEmpty(shipmentContainerAdviceList)) {
+            throw new JeecgBootException("自动预配盘出库, 没有找到出库配盘详情");
+        }
+        return Result.OK("平库预配盘出库成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList) {
+        String zoneType = null;
+        if (StringUtils.isNotEmpty(waveConfig.getZoneCode())) {
+            Zone zone = zoneService.getZoneByCode(waveConfig.getZoneCode(), waveConfig.getWarehouseCode());
+            if (zone == null) {
+                return Result.error("出库单下发， 没有找到库区");
+            }
+            zoneType = zone.getType();
+        }
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
         shipmentHeader.setWaveConfigId(waveConfig.getId());
         shipmentHeader.setCompanyCode(waveConfig.getCompanyCode());
         shipmentHeader.setWarehouseCode(waveConfig.getWarehouseCode());
         shipmentHeader.setZoneCode(waveConfig.getZoneCode());
+        shipmentHeader.setZoneType(zoneType);
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
         if (!result.isSuccess()) {
             throw new JeecgBootException("创建出库单失败，波次ID：" + waveConfigDetailList.get(0).getId());
@@ -317,7 +317,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             Location location = locationService.getNear(fromLocation);
             String locationCode = location.getCode();
             if (StringUtils.isNotEmpty(location.getContainerCode())) {
-                TaskHeader taskHeader = getUnCompleteTaskByFromLocationCode(locationCode, warehouseCode);
+                TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByFromLocationCode(locationCode, warehouseCode);
                 if (taskHeader != null) {
                     preTaskNo = taskHeader.getId();
                 } else {
@@ -3619,6 +3619,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         shipmentHeader.setType(receiptType);
         shipmentHeader.setRemark(remark);
         shipmentHeader.setZoneCode(zoneCode);
+        shipmentHeader.setZoneType(QuantityConstant.ZONE_TYPE_STEREOSCOPIC);
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
         if (!result.isSuccess()) {
             throw new JeecgBootException("快速出库, 创建出库单头失败" + result.getMessage());