Commit 26cc68a69c796effbb924a8e52b1ede1ea79679a

Authored by 谭毅彬
1 parent 6cce5e91

波次功能修改

Signed-off-by: TanYibin <5491541@qq.com>
Showing 20 changed files with 171 additions and 93 deletions
ant-design-vue-jeecg/src/views/system/config/WaveConfigDetailList.vue
... ... @@ -32,6 +32,7 @@
32 32 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
33 33 @change="handleTableChange"
34 34 >
  35 +
35 36 <span slot="action" slot-scope="text, record">
36 37 <a @click="handleEdit(record)">编辑</a>
37 38 <a-divider type="vertical" />
... ... @@ -91,11 +92,6 @@ export default {
91 92 }
92 93 },
93 94 {
94   - title: '主表ID',
95   - align: 'center',
96   - dataIndex: 'mainId'
97   - },
98   - {
99 95 title: '物料编码',
100 96 align: 'center',
101 97 dataIndex: 'materialCode'
... ... @@ -144,6 +140,10 @@ export default {
144 140 scopedSlots: { customRender: 'action' }
145 141 }
146 142 ],
  143 + isorter: {
  144 + column: 'sortingPriority',
  145 + order: 'asc'
  146 + },
147 147 url: {
148 148 list: '/waveConfig/waveConfig/listWaveConfigDetailByMainId',
149 149 delete: '/waveConfig/waveConfig/deleteWaveConfigDetail',
... ... @@ -154,7 +154,8 @@ export default {
154 154 dictOptions: {}
155 155 }
156 156 },
157   - created() {},
  157 + created() {
  158 + },
158 159 computed: {
159 160 importExcelUrl() {
160 161 return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
... ...
ant-design-vue-jeecg/src/views/system/config/WaveConfigList.vue
... ... @@ -16,7 +16,11 @@
16 16 </a-col>
17 17 <a-col :xl="6" :lg="7" :md="8" :sm="24">
18 18 <a-form-item label="是否启用">
19   - <j-dict-select-tag placeholder="请选择是否启用" v-model="queryParam.isEnable" dictCode="is_enable_status" />
  19 + <j-dict-select-tag
  20 + placeholder="请选择是否启用"
  21 + v-model="queryParam.isEnable"
  22 + dictCode="is_enable_status"
  23 + />
20 24 </a-form-item>
21 25 </a-col>
22 26 <a-col :xl="6" :lg="7" :md="8" :sm="24">
... ... @@ -75,6 +79,17 @@
75 79 :customRow="clickThenSelect"
76 80 @change="handleTableChange"
77 81 >
  82 + <span slot="companyCode" slot-scope="companyCode">
  83 + <a-tag :key="companyCode" color="blue">
  84 + {{ solutionCompany(companyCode) }}
  85 + </a-tag>
  86 + </span>
  87 +
  88 + <span slot="zoneCode" slot-scope="zoneCode">
  89 + <a-tag :key="zoneCode" color="blue">
  90 + {{ solutionZoneCode(zoneCode) }}
  91 + </a-tag>
  92 + </span>
78 93  
79 94 <span slot="action" slot-scope="text, record">
80 95 <a @click="handleEdit(record)">编辑</a>
... ... @@ -90,7 +105,6 @@
90 105 </a-menu>
91 106 </a-dropdown>
92 107 </span>
93   -
94 108 </a-table>
95 109 </div>
96 110  
... ... @@ -110,6 +124,7 @@ import WaveConfigModal from &#39;./modules/WaveConfigModal&#39;
110 124 import { getAction } from '@/api/manage'
111 125 import WaveConfigDetailList from './WaveConfigDetailList'
112 126 import '@/assets/less/TableExpand.less'
  127 +import { getCompanyList, getZoneList } from '@/api/api'
113 128  
114 129 export default {
115 130 name: 'WaveConfigList',
... ... @@ -121,9 +136,25 @@ export default {
121 136 data() {
122 137 return {
123 138 description: '波次配置管理页面',
  139 + companyList: [],
  140 + zoneList: [],
124 141 // 表头
125 142 columns: [
126 143 {
  144 + title: '货主',
  145 + align: 'center',
  146 + dataIndex: 'companyCode',
  147 + key: 'companyCode',
  148 + scopedSlots: { customRender: 'companyCode' }
  149 + },
  150 + {
  151 + title: '库区',
  152 + align: 'center',
  153 + dataIndex: 'zoneCode',
  154 + key: 'zoneCode',
  155 + scopedSlots: { customRender: 'zoneCode' }
  156 + },
  157 + {
127 158 title: '波次名称',
128 159 align: 'center',
129 160 dataIndex: 'waveName'
... ... @@ -142,13 +173,13 @@ export default {
142 173 title: '波次模式',
143 174 align: 'center',
144 175 dataIndex: 'waveModel_dictText',
145   - scopedSlots: {customRender: 'waveModel_dictText'}
  176 + scopedSlots: { customRender: 'waveModel_dictText' }
146 177 },
147 178 {
148 179 title: '是否启用',
149 180 align: 'center',
150 181 dataIndex: 'isEnable_dictText',
151   - scopedSlots: {customRender: 'isEnable_dictText'}
  182 + scopedSlots: { customRender: 'isEnable_dictText' }
152 183 },
153 184 {
154 185 title: '创建人',
... ... @@ -205,6 +236,7 @@ export default {
205 236 },
206 237 created() {
207 238 this.getSuperFieldList()
  239 + this.loadFrom()
208 240 },
209 241 computed: {
210 242 importExcelUrl: function() {
... ... @@ -212,6 +244,38 @@ export default {
212 244 }
213 245 },
214 246 methods: {
  247 + solutionCompany(value) {
  248 + var actions = []
  249 + Object.keys(this.companyList).some(key => {
  250 + if (this.companyList[key].code == '' + value) {
  251 + actions.push(this.companyList[key].name)
  252 + return true
  253 + }
  254 + })
  255 + return actions.join('')
  256 + },
  257 + solutionZoneCode(value) {
  258 + var actions = []
  259 + Object.keys(this.zoneList).some(key => {
  260 + if (this.zoneList[key].code == '' + value) {
  261 + actions.push(this.zoneList[key].name)
  262 + return true
  263 + }
  264 + })
  265 + return actions.join('')
  266 + },
  267 + loadFrom() {
  268 + getCompanyList().then(res => {
  269 + if (res.success) {
  270 + this.companyList = res.result
  271 + }
  272 + })
  273 + getZoneList().then(res => {
  274 + if (res.success) {
  275 + this.zoneList = res.result
  276 + }
  277 + })
  278 + },
215 279 initDictConfig() {},
216 280 clickThenSelect(record) {
217 281 return {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
... ... @@ -163,12 +163,12 @@
163 163 </span>
164 164  
165 165 <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
166   - <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
167   - {{ lastStatus_dictText }}
168   - </a-tag>
  166 + <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
  167 + {{ lastStatus_dictText }}
  168 + </a-tag>
169 169 </span>
170 170  
171   - <span slot="companyCode" slot-scope="companyCode">
  171 + <span slot="companyCode" slot-scope="companyCode">
172 172 <a-tag :key="companyCode" color=blue>
173 173 {{ solutionCompany(companyCode) }}
174 174 </a-tag>
... ... @@ -605,7 +605,6 @@ export default {
605 605 },
606 606 solutionZoneCode(value) {
607 607 var actions = []
608   - console.log("solutionZoneCode " + this.zoneList);
609 608 Object.keys(this.zoneList).some((key) => {
610 609 if (this.zoneList[key].code == ('' + value)) {
611 610 actions.push(this.zoneList[key].name)
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java
... ... @@ -44,7 +44,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
44 44 * 保存&启动定时任务
45 45 */
46 46 @Override
47   - @Transactional(rollbackFor = JeecgBootException.class)
  47 + @Transactional(rollbackFor = Exception.class)
48 48 public boolean saveAndScheduleJob(QuartzJob quartzJob) {
49 49 // DB设置修改
50 50 quartzJob.setDelFlag(CommonConstant.DEL_FLAG_0);
... ... @@ -62,7 +62,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
62 62 * 恢复定时任务
63 63 */
64 64 @Override
65   - @Transactional(rollbackFor = JeecgBootException.class)
  65 + @Transactional(rollbackFor = Exception.class)
66 66 public boolean resumeJob(QuartzJob quartzJob) {
67 67 schedulerDelete(quartzJob.getId());
68 68 schedulerAdd(quartzJob.getId(), quartzJob.getJobClassName().trim(), quartzJob.getCronExpression().trim(), quartzJob.getParameter());
... ... @@ -75,7 +75,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
75 75 * @throws SchedulerException
76 76 */
77 77 @Override
78   - @Transactional(rollbackFor = JeecgBootException.class)
  78 + @Transactional(rollbackFor = Exception.class)
79 79 public boolean editAndScheduleJob(QuartzJob quartzJob) throws SchedulerException {
80 80 if (CommonConstant.STATUS_NORMAL.equals(quartzJob.getStatus())) {
81 81 schedulerDelete(quartzJob.getId());
... ... @@ -90,7 +90,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
90 90 * 删除&停止删除定时任务
91 91 */
92 92 @Override
93   - @Transactional(rollbackFor = JeecgBootException.class)
  93 + @Transactional(rollbackFor = Exception.class)
94 94 public boolean deleteAndStopJob(QuartzJob job) {
95 95 schedulerDelete(job.getId());
96 96 boolean ok = this.removeById(job.getId());
... ... @@ -118,7 +118,7 @@ public class QuartzJobServiceImpl extends ServiceImpl&lt;QuartzJobMapper, QuartzJob
118 118 }
119 119  
120 120 @Override
121   - @Transactional(rollbackFor = JeecgBootException.class)
  121 + @Transactional(rollbackFor = Exception.class)
122 122 public void pause(QuartzJob quartzJob) {
123 123 schedulerDelete(quartzJob.getId());
124 124 quartzJob.setStatus(CommonConstant.STATUS_DISABLE);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/controller/WaveConfigController.java
... ... @@ -21,6 +21,7 @@ import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
21 21 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
22 22 import org.jeecg.modules.wms.config.waveConfig.service.IWaveConfigDetailService;
23 23 import org.jeecg.modules.wms.config.waveConfig.service.IWaveConfigService;
  24 +import org.jeecg.utils.HuahengJwtUtil;
24 25 import org.jeecgframework.poi.excel.ExcelImportUtil;
25 26 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
26 27 import org.jeecgframework.poi.excel.entity.ExportParams;
... ... @@ -80,8 +81,9 @@ public class WaveConfigController extends JeecgController&lt;WaveConfig, IWaveConfi
80 81 @ApiOperation(value = "波次配置-分页列表查询", notes = "波次配置-分页列表查询")
81 82 @GetMapping(value = "/list")
82 83 public Result<IPage<WaveConfig>> queryPageList(WaveConfig waveConfig, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
83   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
84   - QueryWrapper<WaveConfig> queryWrapper = QueryGenerator.initQueryWrapper(waveConfig, req.getParameterMap());
  84 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
  85 + HuahengJwtUtil.setWarehouseCode(request, waveConfig);
  86 + QueryWrapper<WaveConfig> queryWrapper = QueryGenerator.initQueryWrapper(waveConfig, request.getParameterMap());
85 87 Page<WaveConfig> page = new Page<WaveConfig>(pageNo, pageSize);
86 88 IPage<WaveConfig> pageList = waveConfigService.page(page, queryWrapper);
87 89 return Result.OK(pageList);
... ... @@ -96,7 +98,8 @@ public class WaveConfigController extends JeecgController&lt;WaveConfig, IWaveConfi
96 98 @ApiOperation(value = "波次配置-添加", notes = "波次配置-添加")
97 99 @RequiresPermissions("waveConfig:add")
98 100 @PostMapping(value = "/add")
99   - public Result<String> add(@RequestBody WaveConfig waveConfig) {
  101 + public Result<String> add(@RequestBody WaveConfig waveConfig, HttpServletRequest request) {
  102 + HuahengJwtUtil.setWarehouseCode(request, waveConfig);
100 103 waveConfigService.save(waveConfig);
101 104 return Result.OK("添加成功!");
102 105 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfig.java
... ... @@ -31,6 +31,21 @@ public class WaveConfig implements Serializable {
31 31 @ApiModelProperty(value = "ID")
32 32 private java.lang.Integer id;
33 33  
  34 + /** 仓库 */
  35 + @Excel(name = "仓库", width = 15)
  36 + @ApiModelProperty(value = "仓库")
  37 + private String warehouseCode;
  38 +
  39 + /** 货主 */
  40 + @Excel(name = "货主", width = 15, dictTable = "company", dicText = "name", dicCode = "code")
  41 + @ApiModelProperty(value = "货主")
  42 + private String companyCode;
  43 +
  44 + /** 库区 */
  45 + @Excel(name = "库区", width = 15, dictTable = "zone", dicText = "name", dicCode = "code")
  46 + @ApiModelProperty(value = "库区")
  47 + private String zoneCode;
  48 +
34 49 /** 波次名称 */
35 50 @Excel(name = "波次名称", width = 15)
36 51 @ApiModelProperty(value = "波次名称")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/waveConfig/entity/WaveConfigDetail.java
... ... @@ -55,16 +55,6 @@ public class WaveConfigDetail implements Serializable {
55 55 @ApiModelProperty(value = "排序优先级")
56 56 private java.lang.Integer sortingPriority;
57 57  
58   - /** 仓库 */
59   - @Excel(name = "仓库", width = 15)
60   - @ApiModelProperty(value = "仓库")
61   - private String warehouseCode;
62   -
63   - /** 库区 */
64   - @Excel(name = "库区", width = 15)
65   - @ApiModelProperty(value = "库区")
66   - private String zoneCode;
67   -
68 58 /** 创建人 */
69 59 @ApiModelProperty(value = "创建人")
70 60 private java.lang.String createBy;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
... ... @@ -193,7 +193,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
193 193 }
194 194  
195 195 @Override
196   - @Transactional(rollbackFor = JeecgBootException.class)
  196 + @Transactional(rollbackFor = Exception.class)
197 197 public Result shipmentInventoryHeader(List<InventoryHeader> inventoryHeaderList, String warehouseCode) {
198 198 if (StringUtils.isEmpty(inventoryHeaderList)) {
199 199 return Result.error("批量快速出库,所选库存头为空");
... ... @@ -293,7 +293,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
293 293 * @return
294 294 */
295 295 @Override
296   - @Transactional(rollbackFor = JeecgBootException.class)
  296 + @Transactional(rollbackFor = Exception.class)
297 297 public Result shipmentInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
298 298 if (StringUtils.isEmpty(inventoryDetailList)) {
299 299 return Result.error("批量快速出库,所选库存详情为空");
... ... @@ -388,7 +388,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
388 388 * @return
389 389 */
390 390 @Override
391   - @Transactional(rollbackFor = JeecgBootException.class)
  391 + @Transactional(rollbackFor = Exception.class)
392 392 public Result decuceInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
393 393 if (CollectionUtils.isEmpty(inventoryDetailList)) {
394 394 return Result.error("扣减库存失败,参数为空");
... ... @@ -508,7 +508,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
508 508 * @return
509 509 */
510 510 @Override
511   - @Transactional(rollbackFor = JeecgBootException.class)
  511 + @Transactional(rollbackFor = Exception.class)
512 512 public Result qualityInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
513 513 if (StringUtils.isEmpty(inventoryDetailList)) {
514 514 return Result.error("质检库存详情失败,所选库存详情为空");
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoCreateWaveConfigTask.java
... ... @@ -55,7 +55,7 @@ public class AutoCreateWaveConfigTask implements Job {
55 55 continue;
56 56 }
57 57 try {
58   - shipmentHeaderService.createShipment(waveConfigDetailList);
  58 + shipmentHeaderService.createShipment(waveConfig, waveConfigDetailList);
59 59 } catch (Exception e) {
60 60 log.error("波次下发任务异常,waveConfig:{}", JSON.toJSONString(waveConfig), e);
61 61 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
... ... @@ -359,7 +359,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
359 359 }
360 360  
361 361 @Override
362   - @Transactional(rollbackFor = JeecgBootException.class)
  362 + @Transactional(rollbackFor = Exception.class)
363 363 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务取消'", extra = "#extraJsonString", msg = "'任务ID:' + #taskHeader.getId()",
364 364 condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
365 365 public boolean cancelReceiptTask(TaskHeader taskHeader) {
... ... @@ -446,7 +446,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
446 446 }
447 447  
448 448 @Override
449   - @Transactional(rollbackFor = JeecgBootException.class)
  449 + @Transactional(rollbackFor = Exception.class)
450 450 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情取消组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
451 451 public Result cancelReceiving(Integer id) {
452 452 log.info("开始取消入库组盘");
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
... ... @@ -104,7 +104,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
104 104 }
105 105  
106 106 @Override
107   - @Transactional(rollbackFor = JeecgBootException.class)
  107 + @Transactional(rollbackFor = Exception.class)
108 108 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情删除'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
109 109 public Result removeDetailById(String id) {
110 110 ReceiptDetail receiptDetail = receiptDetailService.getById(id);
... ... @@ -135,7 +135,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
135 135 }
136 136  
137 137 @Override
138   - @Transactional(rollbackFor = JeecgBootException.class)
  138 + @Transactional(rollbackFor = Exception.class)
139 139 public Result removeDetailListById(List<String> idList) {
140 140 Result result = null;
141 141 for (String id : idList) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
... ... @@ -114,7 +114,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
114 114 * @return
115 115 */
116 116 @Override
117   - @Transactional(rollbackFor = JeecgBootException.class)
  117 + @Transactional(rollbackFor = Exception.class)
118 118 public Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode) {
119 119 Result<ReceiptContainerHeader> result = receiveService.receiving(receiveList, warehouseCode);
120 120 if (result.isSuccess()) {
... ... @@ -135,7 +135,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
135 135 * 7.更新入库单状态
136 136 */
137 137 @Override
138   - @Transactional(rollbackFor = JeecgBootException.class)
  138 + @Transactional(rollbackFor = Exception.class)
139 139 @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
140 140 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
141 141 public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
... ... @@ -339,7 +339,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
339 339 }
340 340  
341 341 @Override
342   - @Transactional(rollbackFor = JeecgBootException.class)
  342 + @Transactional(rollbackFor = Exception.class)
343 343 public Result flatReceive(List<Receive> receiveList, String containerCode, String warehouseCode) {
344 344 log.info("开始平库入库组盘");
345 345 boolean success = false;
... ... @@ -512,7 +512,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
512 512 }
513 513  
514 514 @Override
515   - @Transactional(rollbackFor = JeecgBootException.class)
  515 + @Transactional(rollbackFor = Exception.class)
516 516 public Result flatOnShell(String containerCode, String toLocationCode, String warehouseCode) {
517 517 log.info("开始完成上架任务, 托盘号" + containerCode);
518 518 int taskType = QuantityConstant.TASK_TYPE_WHOLERECEIPT;
... ... @@ -669,7 +669,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
669 669 }
670 670  
671 671 @Override
672   - @Transactional(rollbackFor = JeecgBootException.class)
  672 + @Transactional(rollbackFor = Exception.class)
673 673 public Result flatReceipt(List<Receive> receiveList, String containerCode, String toLocationCode, String warehouseCode) {
674 674 Result result = receiveService.flatReceive(receiveList, containerCode, warehouseCode);
675 675 result = receiveService.flatOnShell(containerCode, toLocationCode, warehouseCode);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
... ... @@ -134,7 +134,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
134 134 * @return
135 135 */
136 136 @Override
137   - @Transactional(rollbackFor = JeecgBootException.class)
  137 + @Transactional(rollbackFor = Exception.class)
138 138 public List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail) {
139 139 String warehouseCode = shipmentDetail.getWarehouseCode();
140 140 String companyCode = shipmentDetail.getCompanyCode();
... ... @@ -213,7 +213,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
213 213 }
214 214  
215 215 @Override
216   - @Transactional(rollbackFor = JeecgBootException.class)
  216 + @Transactional(rollbackFor = Exception.class)
217 217 public List<InventoryDetail> getAllInventorys(ShipmentDetail shipmentDetail) {
218 218 String warehouseCode = shipmentDetail.getWarehouseCode();
219 219 String companyCode = shipmentDetail.getCompanyCode();
... ... @@ -248,13 +248,13 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
248 248 }
249 249  
250 250 @Override
251   - @Transactional(rollbackFor = JeecgBootException.class)
  251 + @Transactional(rollbackFor = Exception.class)
252 252 public Result autoCombination(String shipmentCode, String warehouseCode) {
253 253 return shipmentCombinationService.autoCombination(shipmentCode, false, warehouseCode);
254 254 }
255 255  
256 256 @Override
257   - @Transactional(rollbackFor = JeecgBootException.class)
  257 + @Transactional(rollbackFor = Exception.class)
258 258 public Result autoCombination(String shipmentCode, boolean advice, String warehouseCode) {
259 259 log.info("开始自动配盘,单号" + shipmentCode);
260 260 LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
... ... @@ -290,19 +290,19 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
290 290 }
291 291  
292 292 @Override
293   - @Transactional(rollbackFor = JeecgBootException.class)
  293 + @Transactional(rollbackFor = Exception.class)
294 294 public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
295 295 return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, 0, warehouseCode, shipmentOrder, sequence, sequenceNumber);
296 296 }
297 297  
298 298 @Override
299   - @Transactional(rollbackFor = JeecgBootException.class)
  299 + @Transactional(rollbackFor = Exception.class)
300 300 public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode) {
301 301 return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, forceTaskType, warehouseCode, 0, 0, 0);
302 302 }
303 303  
304 304 @Override
305   - @Transactional(rollbackFor = JeecgBootException.class)
  305 + @Transactional(rollbackFor = Exception.class)
306 306 public Result autoCombinationDetail(ShipmentDetail shipmentDetail, BigDecimal shipQty) {
307 307 return shipmentCombinationService.autoCombinationDetail(shipmentDetail, false, shipQty);
308 308 }
... ... @@ -311,7 +311,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
311 311 * 出库单据明细自动配盘
312 312 */
313 313 @Override
314   - @Transactional(rollbackFor = JeecgBootException.class)
  314 + @Transactional(rollbackFor = Exception.class)
315 315 public Result autoCombinationDetail(ShipmentDetail shipmentDetail, boolean advice, BigDecimal shipQty) {
316 316 // 出库数量
317 317 BigDecimal shipmentQty = shipmentDetail.getQty().subtract(shipmentDetail.getTaskQty());
... ... @@ -394,7 +394,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
394 394 }
395 395  
396 396 @Override
397   - @Transactional(rollbackFor = JeecgBootException.class)
  397 + @Transactional(rollbackFor = Exception.class)
398 398 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
399 399 public Result combination(CombinationModel combinationModel) {
400 400 BigDecimal shipmentQty = combinationModel.getShipQty();
... ... @@ -514,7 +514,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
514 514 }
515 515  
516 516 @Override
517   - @Transactional(rollbackFor = JeecgBootException.class)
  517 + @Transactional(rollbackFor = Exception.class)
518 518 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
519 519 public Result combinationAdvice(CombinationModel combinationModel) {
520 520 BigDecimal shipmentQty = combinationModel.getShipQty();
... ... @@ -634,7 +634,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
634 634 }
635 635  
636 636 @Override
637   - @Transactional(rollbackFor = JeecgBootException.class)
  637 + @Transactional(rollbackFor = Exception.class)
638 638 public ShipmentContainerHeader addShipmentContainerHeader(InventoryDetail inventoryDetail, ShipmentDetail shipmentDetail) {
639 639 String containerCode = inventoryDetail.getContainerCode();
640 640 String warehouseCode = inventoryDetail.getWarehouseCode();
... ... @@ -705,7 +705,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
705 705 }
706 706  
707 707 @Override
708   - @Transactional(rollbackFor = JeecgBootException.class)
  708 + @Transactional(rollbackFor = Exception.class)
709 709 public ShipmentContainerDetail addShipmentContainerDetail(ShipmentContainerHeader shipmentContainerHeader, CombinationModel combinationModel) {
710 710 boolean success = false;
711 711 BigDecimal shipmentQty = combinationModel.getShipQty();
... ... @@ -759,7 +759,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
759 759 }
760 760  
761 761 @Override
762   - @Transactional(rollbackFor = JeecgBootException.class)
  762 + @Transactional(rollbackFor = Exception.class)
763 763 public ShipmentContainerAdvice addShipmentContainerAdvice(ShipmentContainerHeader shipmentContainerHeader, CombinationModel combinationModel) {
764 764 boolean success = false;
765 765 BigDecimal shipmentQty = combinationModel.getShipQty();
... ... @@ -809,7 +809,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
809 809 }
810 810  
811 811 @Override
812   - @Transactional(rollbackFor = JeecgBootException.class)
  812 + @Transactional(rollbackFor = Exception.class)
813 813 public Result flatShipmentByContainerCode(String containerCode, List<FlatShipment> flatShipments, String warehouseCode) {
814 814 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
815 815 if (container == null) {
... ... @@ -1032,7 +1032,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1032 1032 }
1033 1033  
1034 1034 @Override
1035   - @Transactional(rollbackFor = JeecgBootException.class)
  1035 + @Transactional(rollbackFor = Exception.class)
1036 1036 public Result flatShipmentByLocationCode(String locationCode, List<FlatShipment> flatShipments, String warehouseCode) {
1037 1037 InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByLocationCode(locationCode, warehouseCode);
1038 1038 if (inventoryHeader == null) {
... ... @@ -1049,7 +1049,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1049 1049 * @return
1050 1050 */
1051 1051 @Override
1052   - @Transactional(rollbackFor = JeecgBootException.class)
  1052 + @Transactional(rollbackFor = Exception.class)
1053 1053 public Result completeFlatShipment(ShipmentContainerHeader shipmentContainerHeader) {
1054 1054 if (shipmentContainerHeader == null) {
1055 1055 throw new JeecgBootException("完成平库出库失败,获取出库组盘头失败");
... ... @@ -1195,7 +1195,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1195 1195 }
1196 1196  
1197 1197 @Override
1198   - @Transactional(rollbackFor = JeecgBootException.class)
  1198 + @Transactional(rollbackFor = Exception.class)
1199 1199 public Result createCallShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence,
1200 1200 int sequenceNumber) {
1201 1201 Integer preTaskNo = 0;
... ... @@ -1281,7 +1281,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1281 1281 }
1282 1282  
1283 1283 @Override
1284   - @Transactional(rollbackFor = JeecgBootException.class)
  1284 + @Transactional(rollbackFor = Exception.class)
1285 1285 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务生成'", extra = "#extraJsonString1",
1286 1286 msg = "'任务ID:' + #taskHeader.getId() + ',库位编码:' + #shipmentContainerHeader.getFromLocationCode() + ',容器编码:' + #shipmentContainerHeader.getContainerCode() + ',目标出入口:' + #shipmentContainerHeader.getToPort()",
1287 1287 condition = "#shipmentContainerDetailList.size() > 0", recordReturnValue = true)
... ... @@ -1459,7 +1459,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1459 1459 }
1460 1460  
1461 1461 @Override
1462   - @Transactional(rollbackFor = JeecgBootException.class)
  1462 + @Transactional(rollbackFor = Exception.class)
1463 1463 public Result createShipmentTaskByAgv(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode) {
1464 1464 Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
1465 1465 String containerCode = shipmentContainerHeader.getContainerCode();
... ... @@ -1477,7 +1477,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1477 1477 }
1478 1478  
1479 1479 @Override
1480   - @Transactional(rollbackFor = JeecgBootException.class)
  1480 + @Transactional(rollbackFor = Exception.class)
1481 1481 public Result createShipmentTaskAndAgvTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode) {
1482 1482 Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, forceTaskType, warehouseCode);
1483 1483 if (!result.isSuccess()) {
... ... @@ -1511,7 +1511,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
1511 1511 }
1512 1512  
1513 1513 @Override
1514   - @Transactional(rollbackFor = JeecgBootException.class)
  1514 + @Transactional(rollbackFor = Exception.class)
1515 1515 public Result getInventoryFromShipmentDetail(Integer shipmentDetailId) {
1516 1516 ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId);
1517 1517 if (shipmentDetail == null) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerAdvice/service/impl/ShipmentContainerAdviceServiceImpl.java
... ... @@ -97,7 +97,7 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
97 97 }
98 98  
99 99 @Override
100   - @Transactional(rollbackFor = JeecgBootException.class)
  100 + @Transactional(rollbackFor = Exception.class)
101 101 public Result cancelCombine(Integer id) {
102 102 log.info("开始取消预配盘,id:" + id);
103 103 ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id);
... ... @@ -161,7 +161,7 @@ public class ShipmentContainerAdviceServiceImpl extends ServiceImpl&lt;ShipmentCont
161 161 }
162 162  
163 163 @Override
164   - @Transactional(rollbackFor = JeecgBootException.class)
  164 + @Transactional(rollbackFor = Exception.class)
165 165 public Result reduceInventoryDetailBySn(String snList, String warehouseCode) {
166 166 List<String> snList1 = Arrays.asList(snList.split(","));
167 167 LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
... ... @@ -225,7 +225,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
225 225 }
226 226  
227 227 @Override
228   - @Transactional(rollbackFor = JeecgBootException.class)
  228 + @Transactional(rollbackFor = Exception.class)
229 229 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情取消配盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
230 230 public Result cancelCombine(Integer id) {
231 231 log.info("开始取消配盘,id:" + id);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/IShipmentHeaderService.java
... ... @@ -5,6 +5,7 @@ import java.util.Collection;
5 5 import java.util.List;
6 6  
7 7 import org.jeecg.common.api.vo.Result;
  8 +import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
8 9 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
9 10 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
10 11  
... ... @@ -48,5 +49,5 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
48 49  
49 50 Result autoShipmentAdvice(String shipmentCode, String warehouseCode);
50 51  
51   - Result createShipment(List<WaveConfigDetail> waveConfigDetailList);
  52 + Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList);
52 53 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
... ... @@ -53,7 +53,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
53 53 }
54 54  
55 55 @Override
56   - @Transactional(rollbackFor = JeecgBootException.class)
  56 + @Transactional(rollbackFor = Exception.class)
57 57 @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
58 58 public Result saveShipmentDetail(ShipmentDetail shipmentDetail) {
59 59 ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentDetail.getShipmentId());
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java
... ... @@ -21,6 +21,7 @@ import org.jeecg.modules.wms.config.port.entity.Port;
21 21 import org.jeecg.modules.wms.config.port.service.IPortService;
22 22 import org.jeecg.modules.wms.config.shipmentType.entity.ShipmentType;
23 23 import org.jeecg.modules.wms.config.shipmentType.service.IShipmentTypeService;
  24 +import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfig;
24 25 import org.jeecg.modules.wms.config.waveConfig.entity.WaveConfigDetail;
25 26 import org.jeecg.modules.wms.config.zone.entity.Zone;
26 27 import org.jeecg.modules.wms.config.zone.service.IZoneService;
... ... @@ -103,16 +104,22 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
103 104  
104 105 @Resource
105 106 private IShipmentHeaderHistoryService shipmentHeaderHistoryService;
  107 +
106 108 @Resource
107 109 private IShipmentCombinationService shipmentCombinationService;
  110 +
108 111 @Resource
109 112 private IShipmentContainerHeaderService shipmentContainerHeaderService;
  113 +
110 114 @Resource
111 115 private IHuahengMultiHandlerService huahengMultiHandlerService;
  116 +
112 117 @Resource
113 118 private IPortService portService;
  119 +
114 120 @Resource
115 121 private IZoneService zoneService;
  122 +
116 123 @Resource
117 124 private IShipmentContainerAdviceService shipmentContainerAdviceService;
118 125  
... ... @@ -138,7 +145,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
138 145 }
139 146  
140 147 @Override
141   - @Transactional(rollbackFor = JeecgBootException.class)
  148 + @Transactional(rollbackFor = Exception.class)
142 149 @OperationLog(bizId = "#shipmentHeader == null ? '' : #shipmentHeader.getCode()", bizType = "'出库单追踪'", tag = "'出库单新增'",
143 150 msg = "'上游单号:'+ #shipmentHeader.getReferCode() + ',仓库编码:' + #shipmentHeader.getWarehouseCode()", recordReturnValue = true)
144 151 public Result saveShipmentHeader(ShipmentHeader shipmentHeader) {
... ... @@ -363,7 +370,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
363 370 * 自动出库
364 371 */
365 372 @Override
366   - @Transactional(rollbackFor = JeecgBootException.class)
  373 + @Transactional(rollbackFor = Exception.class)
367 374 public Result autoShipment(String shipmentCode, String warehouseCode) {
368 375 if (StringUtils.isEmpty(shipmentCode)) {
369 376 return Result.error("自动出库, 出库单编码为空");
... ... @@ -453,7 +460,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
453 460 * 自动预配盘出库
454 461 */
455 462 @Override
456   - @Transactional(rollbackFor = JeecgBootException.class)
  463 + @Transactional(rollbackFor = Exception.class)
457 464 public Result autoShipmentAdvice(String shipmentCode, String warehouseCode) {
458 465 if (StringUtils.isEmpty(shipmentCode)) {
459 466 return Result.error("自动预配盘出库, 出库单编码为空");
... ... @@ -544,18 +551,14 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
544 551 }
545 552  
546 553 @Override
547   - @Transactional(rollbackFor = JeecgBootException.class)
548   - public Result createShipment(List<WaveConfigDetail> waveConfigDetailList) {
549   -// Map<String, List<WaveConfigDetail>> waveConfigDetailGroup = waveConfigDetailList.stream().collect(Collectors.groupingBy(WaveConfigDetail::getZoneCode));
550   -// for (Map.Entry<String, List<WaveConfigDetail>> stringListEntry : waveConfigDetailGroup.entrySet()) {
551   -//
552   -// }
  554 + @Transactional(rollbackFor = Exception.class)
  555 + public Result createShipment(WaveConfig waveConfig, List<WaveConfigDetail> waveConfigDetailList) {
553 556 ShipmentHeader shipmentHeader = new ShipmentHeader();
554 557 shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
555   - shipmentHeader.setWaveConfigId(waveConfigDetailList.get(0).getMainId());
556   - shipmentHeader.setCompanyCode(QuantityConstant.DEFAULT_COMPANY);
557   - shipmentHeader.setWarehouseCode(waveConfigDetailList.get(0).getWarehouseCode());
558   - shipmentHeader.setZoneCode(waveConfigDetailList.get(0).getZoneCode());
  558 + shipmentHeader.setWaveConfigId(waveConfig.getId());
  559 + shipmentHeader.setCompanyCode(waveConfig.getCompanyCode());
  560 + shipmentHeader.setWarehouseCode(waveConfig.getWarehouseCode());
  561 + shipmentHeader.setZoneCode(waveConfig.getZoneCode());
559 562 Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
560 563 if (!result.isSuccess()) {
561 564 throw new JeecgBootException("创建出库单失败,波次ID:" + waveConfigDetailList.get(0).getId());
... ... @@ -571,7 +574,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
571 574 throw new JeecgBootException("创建出库单明细失败,波次ID:" + waveConfigDetail.getId());
572 575 }
573 576 }
574   - result = shipmentHeaderService.autoShipment(shipmentHeader.getCode(), waveConfigDetailList.get(0).getWarehouseCode());
  577 + result = shipmentHeaderService.autoShipment(shipmentHeader.getCode(), waveConfig.getWarehouseCode());
575 578 if (!result.isSuccess()) {
576 579 throw new JeecgBootException("波次自动出库失败,波次ID:" + waveConfigDetailList.get(0).getId());
577 580 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
... ... @@ -76,7 +76,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
76 76 }
77 77  
78 78 @Override
79   - @Transactional(rollbackFor = JeecgBootException.class)
  79 + @Transactional(rollbackFor = Exception.class)
80 80 public Result sendAgvTaskToAcs(Integer taskId) {
81 81 AgvTask agvTask = getById(taskId);
82 82 if (agvTask == null) {
... ... @@ -94,7 +94,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
94 94 }
95 95  
96 96 @Override
97   - @Transactional(rollbackFor = JeecgBootException.class)
  97 + @Transactional(rollbackFor = Exception.class)
98 98 public Result completeAgvTask(Integer taskId) {
99 99 boolean success = false;
100 100 AgvTask agvTask = getById(taskId);
... ... @@ -152,7 +152,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
152 152 }
153 153  
154 154 @Override
155   - @Transactional(rollbackFor = JeecgBootException.class)
  155 + @Transactional(rollbackFor = Exception.class)
156 156 public Result cancelAgvTask(Integer taskId) {
157 157 AgvTask agvTask = getById(taskId);
158 158 if (agvTask == null) {
... ... @@ -243,7 +243,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
243 243 }
244 244  
245 245 @Override
246   - @Transactional(rollbackFor = JeecgBootException.class)
  246 + @Transactional(rollbackFor = Exception.class)
247 247 public Result editAgvTask(AgvTask agvTask, String warehouseCode) {
248 248 if (agvTask == null) {
249 249 return Result.error("AGV任务信息为空");
... ...
huaheng-wms-core/src/main/resources/application-test.yml
... ... @@ -190,8 +190,10 @@ mybatis-plus:
190 190 configuration:
191 191 map-underscore-to-camel-case: true
192 192 auto-mapping-behavior: full
193   - # 这个配置不打印自带的SQL日志
194   - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
  193 + # 配置打印自带的SQL日志
  194 + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
  195 + # 配置不打印自带的SQL日志
  196 + log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
195 197 # 返回类型为Map,显示null对应的字段
196 198 call-setters-on-nulls: true
197 199 #jeecg专用配置
... ...