Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

生产单excel导入问题修复：1、自定义单号判重；2、生产单拆单员信息缺省值填入；

Browse Source
This commit is contained in:
gaoqr
2025-02-25 15:09:42 +08:00
parent f5d512cd8e
commit 361d590792
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java
+5 -2
View File
@@ -103,6 +103,9 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener
private static final String POSITIVE_ERR = "数据需为正数"; private static final String POSITIVE_ERR = "数据需为正数";
private static final String NUMBER_LENGTH_ERR = "数据长度过长"; private static final String NUMBER_LENGTH_ERR = "数据长度过长";
private static final String EMPTY_STRING = new String();
public DefaultOrderImportExcelListener(OrderImportTempDataMapper orderImportTempDataMapper, OrderService orderService, DictDataApi dictDataApi, SnowFlakeGenerator snowFlakeGenerator, Long orderId, Long taskId) { public DefaultOrderImportExcelListener(OrderImportTempDataMapper orderImportTempDataMapper, OrderService orderService, DictDataApi dictDataApi, SnowFlakeGenerator snowFlakeGenerator, Long orderId, Long taskId) {
this.orderImportTempDataMapper = orderImportTempDataMapper; this.orderImportTempDataMapper = orderImportTempDataMapper;
this.orderService = orderService; this.orderService = orderService;
@@ -251,7 +254,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener
if (4 == rowIndex) { if (4 == rowIndex) {
validOrderInfoLength(leftKey, leftVal, 64); validOrderInfoLength(leftKey, leftVal, 64);
validOrderInfoLength(rightKey, rightVal, 255); validOrderInfoLength(rightKey, rightVal, 255);
orderDO.setSplitter(leftVal); orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftKey : EMPTY_STRING);
orderDO.setRemark(rightVal); orderDO.setRemark(rightVal);
} }
orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus()); orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus());
@@ -272,7 +275,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener
* @param val * @param val
*/ */
private void validCustomOrderNo(String key, String val) { private void validCustomOrderNo(String key, String val) {
if (StringUtils.isNotEmpty(val) && orderService.customOrderNoIsExists(val)) { if (StringUtils.isNotEmpty(val) && !orderService.customOrderNoIsExists(val)) {
throw ServiceExceptionUtil.exception(ORDER_IMPORT_ORDER_CUSTOMERNO_EXISTS, key, val); throw ServiceExceptionUtil.exception(ORDER_IMPORT_ORDER_CUSTOMERNO_EXISTS, key, val);
} }
} }