波次功能修改

Signed-off-by: TanYibin <5491541@qq.com>

波次功能修改
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 6cce5e91
Showing 20 changed files with 171 additions and 93 deletions
ant-design-vue-jeecg/src/views/system/config/WaveConfigDetailList.vue
ant-design-vue-jeecg/src/views/system/config/WaveConfigList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/controller/WaveConfigController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfig.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.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/monitor/job/AutoCreateWaveConfigTask.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.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/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/service/IShipmentHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
huaheng-wms-core/src/main/resources/application-test.yml
@@ -32,6 +32,7 @@
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
       >
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
@@ -91,11 +92,6 @@ export default {
           }
         },
         {
-          title: '主表ID',
-          align: 'center',
-          dataIndex: 'mainId'
-        },
-        {
           title: '物料编码',
           align: 'center',
           dataIndex: 'materialCode'
@@ -144,6 +140,10 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
+      isorter: {
+        column: 'sortingPriority',
+        order: 'asc'
+      },
       url: {
         list: '/waveConfig/waveConfig/listWaveConfigDetailByMainId',
         delete: '/waveConfig/waveConfig/deleteWaveConfigDetail',
@@ -154,7 +154,8 @@ export default {
       dictOptions: {}
     }
   },
-  created() {},
+  created() {
+  },
   computed: {
     importExcelUrl() {
       return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
@@ -16,7 +16,11 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否启用">
-              <j-dict-select-tag placeholder="请选择是否启用" v-model="queryParam.isEnable" dictCode="is_enable_status" />
+              <j-dict-select-tag
+                placeholder="请选择是否启用"
+                v-model="queryParam.isEnable"
+                dictCode="is_enable_status"
+              />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -75,6 +79,17 @@
         :customRow="clickThenSelect"
         @change="handleTableChange"
       >
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color="blue">
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="zoneCode" slot-scope="zoneCode">
+          <a-tag :key="zoneCode" color="blue">
+            {{ solutionZoneCode(zoneCode) }}
+          </a-tag>
+        </span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
@@ -90,7 +105,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -110,6 +124,7 @@ import WaveConfigModal from &#39;./modules/WaveConfigModal&#39;
 import { getAction } from '@/api/manage'
 import WaveConfigDetailList from './WaveConfigDetailList'
 import '@/assets/less/TableExpand.less'
+import { getCompanyList, getZoneList } from '@/api/api'
 export default {
   name: 'WaveConfigList',
@@ -121,9 +136,25 @@ export default {
   data() {
     return {
       description: '波次配置管理页面',
+      companyList: [],
+      zoneList: [],
       // 表头
       columns: [
         {
+          title: '货主',
+          align: 'center',
+          dataIndex: 'companyCode',
+          key: 'companyCode',
+          scopedSlots: { customRender: 'companyCode' }
+        },
+        {
+          title: '库区',
+          align: 'center',
+          dataIndex: 'zoneCode',
+          key: 'zoneCode',
+          scopedSlots: { customRender: 'zoneCode' }
+        },
+        {
           title: '波次名称',
           align: 'center',
           dataIndex: 'waveName'
@@ -142,13 +173,13 @@ export default {
           title: '波次模式',
           align: 'center',
           dataIndex: 'waveModel_dictText',
-          scopedSlots: {customRender: 'waveModel_dictText'}
+          scopedSlots: { customRender: 'waveModel_dictText' }
         },
         {
           title: '是否启用',
           align: 'center',
           dataIndex: 'isEnable_dictText',
-          scopedSlots: {customRender: 'isEnable_dictText'}
+          scopedSlots: { customRender: 'isEnable_dictText' }
         },
         {
           title: '创建人',
@@ -205,6 +236,7 @@ export default {
   },
   created() {
     this.getSuperFieldList()
+    this.loadFrom()
   },
   computed: {
     importExcelUrl: function() {
@@ -212,6 +244,38 @@ export default {
     }
   },
   methods: {
+    solutionCompany(value) {
+      var actions = []
+      Object.keys(this.companyList).some(key => {
+        if (this.companyList[key].code == '' + value) {
+          actions.push(this.companyList[key].name)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+    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('')
+    },
+    loadFrom() {
+      getCompanyList().then(res => {
+        if (res.success) {
+          this.companyList = res.result
+        }
+      })
+      getZoneList().then(res => {
+        if (res.success) {
+          this.zoneList = res.result
+        }
+      })
+    },
     initDictConfig() {},
     clickThenSelect(record) {
       return {
@@ -163,12 +163,12 @@
         </span>
         <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
-            <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
-              {{ lastStatus_dictText }}
-            </a-tag>
+          <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
+            {{ lastStatus_dictText }}
+          </a-tag>
         </span>
-         <span slot="companyCode" slot-scope="companyCode">
+        <span slot="companyCode" slot-scope="companyCode">
           <a-tag :key="companyCode" color=blue>
             {{ solutionCompany(companyCode) }}
           </a-tag>
@@ -605,7 +605,6 @@ export default {
     },
     solutionZoneCode(value) {
       var actions = []
-      console.log("solutionZoneCode " + this.zoneList);
       Object.keys(this.zoneList).some((key) => {
         if (this.zoneList[key].code == ('' + value)) {
           actions.push(this.zoneList[key].name)
@@ -44,7 +44,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
      * 保存&启动定时任务
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveAndScheduleJob(QuartzJob quartzJob) {
         // DB设置修改
         quartzJob.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -62,7 +62,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
      * 恢复定时任务
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean resumeJob(QuartzJob quartzJob) {
         schedulerDelete(quartzJob.getId());
         schedulerAdd(quartzJob.getId(), quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
@@ -75,7 +75,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
      * @throws SchedulerException
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean editAndScheduleJob(QuartzJob quartzJob) throws SchedulerException {
         if (CommonConstant.STATUS_NORMAL.equals(quartzJob.getStatus())) {
             schedulerDelete(quartzJob.getId());
@@ -90,7 +90,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
      * 删除&停止删除定时任务
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean deleteAndStopJob(QuartzJob job) {
         schedulerDelete(job.getId());
         boolean ok = this.removeById(job.getId());
@@ -118,7 +118,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public void pause(QuartzJob quartzJob) {
         schedulerDelete(quartzJob.getId());
         quartzJob.setStatus(CommonConstant.STATUS_DISABLE);
@@ -21,6 +21,7 @@ import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
 import org.jeecg.modules.wms.config.waveConfig.service.IWaveConfigDetailService;
 import org.jeecg.modules.wms.config.waveConfig.service.IWaveConfigService;
+import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -80,8 +81,9 @@ public class WaveConfigController extends JeecgController&lt;WaveConfig, IWaveConfi
     @ApiOperation(value = "波次配置-分页列表查询", notes = "波次配置-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<WaveConfig>> queryPageList(WaveConfig waveConfig, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        QueryWrapper<WaveConfig> queryWrapper = QueryGenerator.initQueryWrapper(waveConfig, req.getParameterMap());
+        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        HuahengJwtUtil.setWarehouseCode(request, waveConfig);
+        QueryWrapper<WaveConfig> queryWrapper = QueryGenerator.initQueryWrapper(waveConfig, request.getParameterMap());
         Page<WaveConfig> page = new Page<WaveConfig>(pageNo, pageSize);
         IPage<WaveConfig> pageList = waveConfigService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -96,7 +98,8 @@ public class WaveConfigController extends JeecgController&lt;WaveConfig, IWaveConfi
     @ApiOperation(value = "波次配置-添加", notes = "波次配置-添加")
     @RequiresPermissions("waveConfig:add")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody WaveConfig waveConfig) {
+    public Result<String> add(@RequestBody WaveConfig waveConfig, HttpServletRequest request) {
+        HuahengJwtUtil.setWarehouseCode(request, waveConfig);
         waveConfigService.save(waveConfig);
         return Result.OK("添加成功！");
     }
@@ -31,6 +31,21 @@ public class WaveConfig implements Serializable {
     @ApiModelProperty(value = "ID")
     private java.lang.Integer id;
+    /** 仓库 */
+    @Excel(name = "仓库", width = 15)
+    @ApiModelProperty(value = "仓库")
+    private String warehouseCode;
+
+    /** 货主 */
+    @Excel(name = "货主", width = 15, dictTable = "company", dicText = "name", dicCode = "code")
+    @ApiModelProperty(value = "货主")
+    private String companyCode;
+
+    /** 库区 */
+    @Excel(name = "库区", width = 15, dictTable = "zone", dicText = "name", dicCode = "code")
+    @ApiModelProperty(value = "库区")
+    private String zoneCode;
+
     /** 波次名称 */
     @Excel(name = "波次名称", width = 15)
     @ApiModelProperty(value = "波次名称")
@@ -55,16 +55,6 @@ public class WaveConfigDetail implements Serializable {
     @ApiModelProperty(value = "排序优先级")
     private java.lang.Integer sortingPriority;
-    /** 仓库 */
-    @Excel(name = "仓库", width = 15)
-    @ApiModelProperty(value = "仓库")
-    private String warehouseCode;
-
-    /** 库区 */
-    @Excel(name = "库区", width = 15)
-    @ApiModelProperty(value = "库区")
-    private String zoneCode;
-
     /** 创建人 */
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
@@ -193,7 +193,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result shipmentInventoryHeader(List<InventoryHeader> inventoryHeaderList, String warehouseCode) {
         if (StringUtils.isEmpty(inventoryHeaderList)) {
             return Result.error("批量快速出库,所选库存头为空");
@@ -293,7 +293,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result shipmentInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
         if (StringUtils.isEmpty(inventoryDetailList)) {
             return Result.error("批量快速出库,所选库存详情为空");
@@ -388,7 +388,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result decuceInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
         if (CollectionUtils.isEmpty(inventoryDetailList)) {
             return Result.error("扣减库存失败，参数为空");
@@ -508,7 +508,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result qualityInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
         if (StringUtils.isEmpty(inventoryDetailList)) {
             return Result.error("质检库存详情失败,所选库存详情为空");
@@ -55,7 +55,7 @@ public class AutoCreateWaveConfigTask implements Job {
                 continue;
             }
             try {
-                shipmentHeaderService.createShipment(waveConfigDetailList);
+                shipmentHeaderService.createShipment(waveConfig, waveConfigDetailList);
             } catch (Exception e) {
                 log.error("波次下发任务异常，waveConfig：{}", JSON.toJSONString(waveConfig), e);
             }
@@ -359,7 +359,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务取消'", extra = "#extraJsonString", msg = "'任务ID：' + #taskHeader.getId()",
         condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
     public boolean cancelReceiptTask(TaskHeader taskHeader) {
@@ -446,7 +446,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情取消组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result cancelReceiving(Integer id) {
         log.info("开始取消入库组盘");
@@ -104,7 +104,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result removeDetailById(String id) {
         ReceiptDetail receiptDetail = receiptDetailService.getById(id);
@@ -135,7 +135,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result removeDetailListById(List<String> idList) {
         Result result = null;
         for (String id : idList) {
@@ -114,7 +114,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode) {
         Result<ReceiptContainerHeader> result = receiveService.receiving(receiveList, warehouseCode);
         if (result.isSuccess()) {
@@ -135,7 +135,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
      * 7.更新入库单状态
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
@@ -339,7 +339,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result flatReceive(List<Receive> receiveList, String containerCode, String warehouseCode) {
         log.info("开始平库入库组盘");
         boolean success = false;
@@ -512,7 +512,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result flatOnShell(String containerCode, String toLocationCode, String warehouseCode) {
         log.info("开始完成上架任务, 托盘号" + containerCode);
         int taskType = QuantityConstant.TASK_TYPE_WHOLERECEIPT;
@@ -669,7 +669,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result flatReceipt(List<Receive> receiveList, String containerCode, String toLocationCode, String warehouseCode) {
         Result result = receiveService.flatReceive(receiveList, containerCode, warehouseCode);
         result = receiveService.flatOnShell(containerCode, toLocationCode, warehouseCode);
@@ -134,7 +134,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail) {
         String warehouseCode = shipmentDetail.getWarehouseCode();
         String companyCode = shipmentDetail.getCompanyCode();
@@ -213,7 +213,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public List<InventoryDetail> getAllInventorys(ShipmentDetail shipmentDetail) {
         String warehouseCode = shipmentDetail.getWarehouseCode();
         String companyCode = shipmentDetail.getCompanyCode();
@@ -248,13 +248,13 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoCombination(String shipmentCode, String warehouseCode) {
         return shipmentCombinationService.autoCombination(shipmentCode, false, warehouseCode);
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoCombination(String shipmentCode, boolean advice, String warehouseCode) {
         log.info("开始自动配盘,单号" + shipmentCode);
         LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -290,19 +290,19 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
         return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, 0, warehouseCode, shipmentOrder, sequence, sequenceNumber);
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode) {
         return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, forceTaskType, warehouseCode, 0, 0, 0);
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoCombinationDetail(ShipmentDetail shipmentDetail, BigDecimal shipQty) {
         return shipmentCombinationService.autoCombinationDetail(shipmentDetail, false, shipQty);
     }
@@ -311,7 +311,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
      * 出库单据明细自动配盘
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoCombinationDetail(ShipmentDetail shipmentDetail, boolean advice, BigDecimal shipQty) {
         // 出库数量
         BigDecimal shipmentQty = shipmentDetail.getQty().subtract(shipmentDetail.getTaskQty());
@@ -394,7 +394,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result combination(CombinationModel combinationModel) {
         BigDecimal shipmentQty = combinationModel.getShipQty();
@@ -514,7 +514,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result combinationAdvice(CombinationModel combinationModel) {
         BigDecimal shipmentQty = combinationModel.getShipQty();
@@ -634,7 +634,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public ShipmentContainerHeader addShipmentContainerHeader(InventoryDetail inventoryDetail, ShipmentDetail shipmentDetail) {
         String containerCode = inventoryDetail.getContainerCode();
         String warehouseCode = inventoryDetail.getWarehouseCode();
@@ -705,7 +705,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public ShipmentContainerDetail addShipmentContainerDetail(ShipmentContainerHeader shipmentContainerHeader, CombinationModel combinationModel) {
         boolean success = false;
         BigDecimal shipmentQty = combinationModel.getShipQty();
@@ -759,7 +759,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public ShipmentContainerAdvice addShipmentContainerAdvice(ShipmentContainerHeader shipmentContainerHeader, CombinationModel combinationModel) {
         boolean success = false;
         BigDecimal shipmentQty = combinationModel.getShipQty();
@@ -809,7 +809,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result flatShipmentByContainerCode(String containerCode, List<FlatShipment> flatShipments, String warehouseCode) {
         Container container = containerService.getContainerByCode(containerCode, warehouseCode);
         if (container == null) {
@@ -1032,7 +1032,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result flatShipmentByLocationCode(String locationCode, List<FlatShipment> flatShipments, String warehouseCode) {
         InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByLocationCode(locationCode, warehouseCode);
         if (inventoryHeader == null) {
@@ -1049,7 +1049,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
      * @return
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result completeFlatShipment(ShipmentContainerHeader shipmentContainerHeader) {
         if (shipmentContainerHeader == null) {
             throw new JeecgBootException("完成平库出库失败，获取出库组盘头失败");
@@ -1195,7 +1195,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result createCallShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence,
         int sequenceNumber) {
         Integer preTaskNo = 0;
@@ -1281,7 +1281,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString1",
         msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #shipmentContainerHeader.getFromLocationCode() + '，容器编码：' + #shipmentContainerHeader.getContainerCode() + '，目标出入口：' + #shipmentContainerHeader.getToPort()",
         condition = "#shipmentContainerDetailList.size() > 0", recordReturnValue = true)
@@ -1459,7 +1459,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result createShipmentTaskByAgv(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode) {
         Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
         String containerCode = shipmentContainerHeader.getContainerCode();
@@ -1477,7 +1477,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result createShipmentTaskAndAgvTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode) {
         Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, forceTaskType, warehouseCode);
         if (!result.isSuccess()) {
@@ -1511,7 +1511,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result getInventoryFromShipmentDetail(Integer shipmentDetailId) {
         ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId);
         if (shipmentDetail == null) {
@@ -97,7 +97,7 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result cancelCombine(Integer id) {
         log.info("开始取消预配盘,id:" + id);
         ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id);
@@ -161,7 +161,7 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result reduceInventoryDetailBySn(String snList, String warehouseCode) {
         List<String> snList1 = Arrays.asList(snList.split(","));
         LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -225,7 +225,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情取消配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result cancelCombine(Integer id) {
         log.info("开始取消配盘,id:" + id);
@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.List;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
@@ -48,5 +49,5 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
     Result autoShipmentAdvice(String shipmentCode, String warehouseCode);
-    Result createShipment(List<WaveConfigDetail> waveConfigDetailList);
+    Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList);
 }
@@ -53,7 +53,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result saveShipmentDetail(ShipmentDetail shipmentDetail) {
         ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentDetail.getShipmentId());
@@ -21,6 +21,7 @@ import org.jeecg.modules.wms.config.port.entity.Port;
 import org.jeecg.modules.wms.config.port.service.IPortService;
 import org.jeecg.modules.wms.config.shipmentType.entity.ShipmentType;
 import org.jeecg.modules.wms.config.shipmentType.service.IShipmentTypeService;
+import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
 import org.jeecg.modules.wms.config.zone.entity.Zone;
 import org.jeecg.modules.wms.config.zone.service.IZoneService;
@@ -103,16 +104,22 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     @Resource
     private IShipmentHeaderHistoryService shipmentHeaderHistoryService;
+
     @Resource
     private IShipmentCombinationService shipmentCombinationService;
+
     @Resource
     private IShipmentContainerHeaderService shipmentContainerHeaderService;
+
     @Resource
     private IHuahengMultiHandlerService huahengMultiHandlerService;
+
     @Resource
     private IPortService portService;
+
     @Resource
     private IZoneService zoneService;
+
     @Resource
     private IShipmentContainerAdviceService shipmentContainerAdviceService;
@@ -138,7 +145,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     @OperationLog(bizId = "#shipmentHeader == null ? '' : #shipmentHeader.getCode()", bizType = "'出库单追踪'", tag = "'出库单新增'",
         msg = "'上游单号：'+ #shipmentHeader.getReferCode() + '，仓库编码：' + #shipmentHeader.getWarehouseCode()", recordReturnValue = true)
     public Result saveShipmentHeader(ShipmentHeader shipmentHeader) {
@@ -363,7 +370,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
      * 自动出库
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoShipment(String shipmentCode, String warehouseCode) {
         if (StringUtils.isEmpty(shipmentCode)) {
             return Result.error("自动出库, 出库单编码为空");
@@ -453,7 +460,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
      * 自动预配盘出库
      */
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result autoShipmentAdvice(String shipmentCode, String warehouseCode) {
         if (StringUtils.isEmpty(shipmentCode)) {
             return Result.error("自动预配盘出库, 出库单编码为空");
@@ -544,18 +551,14 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
-    public Result createShipment(List<WaveConfigDetail> waveConfigDetailList) {
-//        Map<String, List<WaveConfigDetail>> waveConfigDetailGroup = waveConfigDetailList.stream().collect(Collectors.groupingBy(WaveConfigDetail::getZoneCode));
-//        for (Map.Entry<String, List<WaveConfigDetail>> stringListEntry : waveConfigDetailGroup.entrySet()) {
-//
-//        }
+    @Transactional(rollbackFor = Exception.class)
+    public Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList) {
         ShipmentHeader shipmentHeader = new ShipmentHeader();
         shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
-        shipmentHeader.setWaveConfigId(waveConfigDetailList.get(0).getMainId());
-        shipmentHeader.setCompanyCode(QuantityConstant.DEFAULT_COMPANY);
-        shipmentHeader.setWarehouseCode(waveConfigDetailList.get(0).getWarehouseCode());
-        shipmentHeader.setZoneCode(waveConfigDetailList.get(0).getZoneCode());
+        shipmentHeader.setWaveConfigId(waveConfig.getId());
+        shipmentHeader.setCompanyCode(waveConfig.getCompanyCode());
+        shipmentHeader.setWarehouseCode(waveConfig.getWarehouseCode());
+        shipmentHeader.setZoneCode(waveConfig.getZoneCode());
         Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
         if (!result.isSuccess()) {
             throw new JeecgBootException("创建出库单失败，波次ID：" + waveConfigDetailList.get(0).getId());
@@ -571,7 +574,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
                 throw new JeecgBootException("创建出库单明细失败，波次ID：" + waveConfigDetail.getId());
             }
         }
-        result = shipmentHeaderService.autoShipment(shipmentHeader.getCode(), waveConfigDetailList.get(0).getWarehouseCode());
+        result = shipmentHeaderService.autoShipment(shipmentHeader.getCode(), waveConfig.getWarehouseCode());
         if (!result.isSuccess()) {
             throw new JeecgBootException("波次自动出库失败，波次ID：" + waveConfigDetailList.get(0).getId());
         }
@@ -76,7 +76,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result sendAgvTaskToAcs(Integer taskId) {
         AgvTask agvTask = getById(taskId);
         if (agvTask == null) {
@@ -94,7 +94,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result completeAgvTask(Integer taskId) {
         boolean success = false;
         AgvTask agvTask = getById(taskId);
@@ -152,7 +152,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result cancelAgvTask(Integer taskId) {
         AgvTask agvTask = getById(taskId);
         if (agvTask == null) {
@@ -243,7 +243,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
     }
     @Override
-    @Transactional(rollbackFor = JeecgBootException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Result editAgvTask(AgvTask agvTask, String warehouseCode) {
         if (agvTask == null) {
             return Result.error("AGV任务信息为空");
@@ -190,8 +190,10 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
-    # 这个配置不打印自带的SQL日志
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 配置打印自带的SQL日志
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 配置不打印自带的SQL日志
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置