diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 38b2e0dd0..a9a5cc09f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -153,6 +153,7 @@ public class OrderController { List orderBodyMap = orderService.getOrderBody(orderId); return success(orderBodyMap); } + @GetMapping("/get-roomToString") @Operation(summary = "生产单详情-房间和柜体id(toString)") @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024") @@ -199,6 +200,7 @@ public class OrderController { List moduleDOList = orderService.getPlatesDetail(orderId, roomId, bodyId, groupId, groupName); return success(moduleDOList); } + @GetMapping("/get-platesDetailsPage") @Operation(summary = "生产单详情-板材详细信息(分页)") @Parameters({ @@ -209,19 +211,19 @@ public class OrderController { @Parameter(name = "groupName", description = "加工组名称", example = "弧形"), @Parameter(name = "pageNo", description = "第几页", example = "1"), @Parameter(name = "pageSize", description = "条数", example = "10") - }) @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> platesDetails(@RequestParam("orderId") Long orderId, - @RequestParam(value = "roomId", required = false) Long roomId, - @RequestParam(value = "bodyId", required = false) Long bodyId, - @RequestParam(value = "groupId", required = false) Long groupId, - @RequestParam(value = "groupName", required = false) String groupName, - @RequestParam(value = "pageNo") Integer pageNo, - @RequestParam(value = "pageSize") Integer pageSize) { + @RequestParam(value = "roomId", required = false) Long roomId, + @RequestParam(value = "bodyId", required = false) Long bodyId, + @RequestParam(value = "groupId", required = false) Long groupId, + @RequestParam(value = "groupName", required = false) String groupName, + @RequestParam(value = "pageNo") Integer pageNo, + @RequestParam(value = "pageSize") Integer pageSize) { PageResult moduleDOList = orderService.getPlatesDetail(orderId, roomId, bodyId, groupId, groupName, pageNo, pageSize); return success(moduleDOList); } + @GetMapping("/get-partsDetails") @Operation(summary = "生产单详情-配件详细信息") @Parameters({ @@ -238,6 +240,7 @@ public class OrderController { List moduleDOList = orderService.getPartsDetail(orderId, roomId, bodyId, name); return success(moduleDOList); } + @GetMapping("/get-partsDetailsPage") @Operation(summary = "生产单详情-配件详细信息(分页)") @Parameters({ @@ -250,14 +253,15 @@ public class OrderController { }) @PreAuthorize("@ss.hasPermission('production:manager-list:detail')") public CommonResult> partsDetails(@RequestParam("orderId") Long orderId, - @RequestParam(value = "roomId", required = false) Long roomId, - @RequestParam(value = "bodyId", required = false) Long bodyId, - @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "pageNo") Integer pageNo, - @RequestParam(value = "pageSize") Integer pageSize) { + @RequestParam(value = "roomId", required = false) Long roomId, + @RequestParam(value = "bodyId", required = false) Long bodyId, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "pageNo") Integer pageNo, + @RequestParam(value = "pageSize") Integer pageSize) { PageResult moduleDOList = orderService.getPartsDetail(orderId, roomId, bodyId, name, pageNo, pageSize); return success(moduleDOList); } + // 柜体数据获取，需要加上柜体的属性 @GetMapping("/get-body") @Operation(summary = "生产单柜体数据获取") @@ -319,7 +323,6 @@ public class OrderController { // 读取文件 excelReadUtil.setErr(0); Map map = excelReadUtil.read(file); -// System.out.println(" map " + map); System.err.println(excelReadUtil.isErr()); // 判断是否读取有误 if (excelReadUtil.isErr() == -1) { // 文件为空 @@ -352,7 +355,70 @@ public class OrderController { } else if (type == 2) { // xml } - orderService.importExcelData(orderDO, list); + orderService.importExcelData(orderDO, list, 0); + } catch (Exception e) { + ExcelWriterUtil.writeErr(response, "系统出现未知错误，请下载模板，按照模板重新上传文件", orderService.getSavePath() + File.separator + "order_err.xlsx"); + } + } + + @PostMapping("/importFileAdd") + @Operation(summary = "生产单文件导入新增/导入板材") + @Parameters({ + @Parameter(name = "file", description = "文件", required = true), + @Parameter(name = "type", description = "文件类型", required = true), + @Parameter(name = "index", description = "导入范围 0:全部，1:板材，默认为全部", required = false), + @Parameter(name = "id", description = "生产单id", required = false) + }) + @OperateLog(type = IMPORT) + @PreAuthorize("@ss.hasPermission('production:manager-list:create')") + public void exportTestTwo(@RequestPart("file") MultipartFile file, + @RequestParam(value = "type") Integer type, + @RequestParam(value = "index", required = false, defaultValue = "0") Integer index, + @RequestParam(value = "id", required = false, defaultValue = "0") Long orderId, + HttpServletResponse response) throws IOException { + try { + List list = null; + OrderDO orderDO = new OrderDO(); + + if (type == 0) { //excel +// 读取文件 + excelReadUtil.setErr(0); + Map map = excelReadUtil.read(file); + System.out.println(" map + " + map); +// 判断是否读取有误 + if (excelReadUtil.isErr() > 0) { +// 板材数据格式错误 + ExcelWriterUtil.write(response, (Map) map.get("order"), (List) map.get("plate"), + orderService.getSavePath() + File.separator + "order_add_excel_err.xlsx"); + return; + }else { + list = (List) map.get("plate"); + + if (index == null || index == 0) { // 全部导入 + Map mapOrder = excelReadUtil.changeOrderDO((Map) map.get("order")); + + if (list.size() == 0) { + orderDO.setStatus(0); + } + orderDO = ((OrderDO) mapOrder.get("order")).setOrderType(OrderTypeEnum.MAIN_ORDER.getStatus()); + String err = ((String) mapOrder.get("error")); + + if (!orderService.customOrderNoIsExists(orderDO.getCustomOrderNo())) { + err += orderDO.getCustomOrderNo() + "-自定义生产单号已存在；"; + } + if (!err.equals("")) { + ExcelWriterUtil.writeErr(response, err, orderService.getSavePath() + File.separator + "order_err.xlsx"); + } + }else { // 板材导入 + orderDO.setId(orderId); + } + } + } else if (type == 1) { // json + + } else if (type == 2) { // xml + + } + orderService.importExcelData(orderDO, list, index); } catch (Exception e) { ExcelWriterUtil.writeErr(response, "系统出现未知错误，请下载模板，按照模板重新上传文件", orderService.getSavePath() + File.separator + "order_err.xlsx"); } @@ -392,7 +458,7 @@ public class OrderController { return success(orderService.getPrintDataMap(orderId, type, response)); } -// 获取api订单接口 + // 获取api订单接口 @GetMapping("/getApiOrder") @Operation(summary = "获取api订单接口") @Parameters({ @@ -411,38 +477,21 @@ public class OrderController { JSONObject oauth = apiDataAchieve.getApiToken(organId).get(); String token = oauth.getJSONObject("info").getString("access_token"); String shopId = oauth.getJSONObject("info").getString("shop_id"); - JSONObject orderList = apiDataAchieve.getApiOrderList(token,shopId,startTime,endTime,orderNo,customOrderNo).get(); + JSONObject orderList = apiDataAchieve.getApiOrderList(token, shopId, startTime, endTime, orderNo, customOrderNo).get(); return success(orderService.getApiOrderList(orderList)); } -// 统计 -// 生产单状态分组统计返回 - @GetMapping("/getOrderStatusCount") - @Operation(summary = "生产单状态分组统计返回") - @Parameter(name = "startTerm", description = "按周,按月,按年", required = false, example = "1,2,3") - @PreAuthorize("@ss.hasPermission('productManager:List')") - public CommonResult> getOrderStatusCount(@RequestParam(value = "startTerm", required = false) Integer startTerm) { - return success(orderService.getOrderStatusCount(startTerm)); - } - -// 小板数据分析 - @GetMapping("/getOrderPlateAnalysisCount") - @Operation(summary = "小板数据分析统计（小板数量、小班面积）") - @PreAuthorize("@ss.hasPermission('productManager:List')") - public CommonResult> getOrderPlateAnalysisCount() { - return success(orderService.getOrderPlateAnalysisCount()); - } - + // 统计 // 生产单超期/到期告警 （工作台） @GetMapping("/getOrderWarn") - @Operation(summary = "生产单警告") + @Operation(summary = "生产单超期/到期告警 （工作台）") @PreAuthorize("@ss.hasPermission('productManager:List')") - public CommonResult>> getOrderOverdue() { + public CommonResult>> getOrderOverdue() { return success(orderService.getOrderWarn()); } -// 生产单总数 + // 生产单总数 @GetMapping("/orderCount") @Operation(summary = "生产单总数") @PreAuthorize("@ss.hasPermission('productManager:List')") @@ -450,7 +499,7 @@ public class OrderController { return success(orderService.orderCount()); } -// 今日新增生产单总数 + // 今日新增生产单总数 @GetMapping("/orderCountToday") @Operation(summary = "今日新增生产单总数") @PreAuthorize("@ss.hasPermission('productManager:List')") @@ -458,7 +507,7 @@ public class OrderController { return success(orderService.orderCountToday()); } -// 今日生产单完成总数 + // 今日生产单完成总数 @GetMapping("/orderCountTodayFinish") @Operation(summary = "今日生产单完成总数") @PreAuthorize("@ss.hasPermission('productManager:List')") @@ -466,7 +515,7 @@ public class OrderController { return success(orderService.orderCountTodayFinish()); } -// 生产中生产单总数 + // 生产中生产单总数 @GetMapping("/orderCountProduce") @Operation(summary = "生产中生产单总数") @PreAuthorize("@ss.hasPermission('productManager:List')") @@ -474,7 +523,7 @@ public class OrderController { return success(orderService.orderCountProduce()); } -// 生产中生产平方数 + // 生产中生产平方数 @GetMapping("/orderSquareProduce") @Operation(summary = "生产中生产平方数") @PreAuthorize("@ss.hasPermission('productManager:List')") @@ -482,20 +531,50 @@ public class OrderController { return success(orderService.orderSquareProduce()); } -// 小板数量 + // 生产单状态分组统计返回 + @GetMapping("/getOrderStatusCount") + @Operation(summary = "生产单状态分组统计返回") + @Parameters({ + @Parameter(name = "startTime", description = "开始时间", example = "2024-07-15"), + @Parameter(name = "endTime", description = "结束时间", example = "2024-07-16") + }) + @PreAuthorize("@ss.hasPermission('productManager:List')") + public CommonResult> getOrderStatusCount(@RequestParam(value = "startTime") String startTime, + @RequestParam(value = "endTime") String endTime) { + return success(orderService.getOrderStatusCount(startTime + " 00:00:00", endTime + " 23:59:59")); + } + + // 小板数量 <集合> @GetMapping("/getPlateCount") @Operation(summary = "小板数量") @Parameters({ - @Parameter(name = "startTime", description = "开始时间", required = false), - @Parameter(name = "endTime", description = "结束时间", required = false), - @Parameter(name = "goodsId", description = "材料id", required = true), - @Parameter(name = "organId", description = "组织id", required = false, example = "1") + @Parameter(name = "startTime", description = "开始时间", example = "2024-07-15"), + @Parameter(name = "endTime", description = "结束时间", example = "2024-07-16"), + @Parameter(name = "pageNo", description = "第几页", example = "1"), + @Parameter(name = "pageSize", description = "每页条数", example = "10") }) @PreAuthorize("@ss.hasPermission('productManager:List')") - public CommonResult getPlateCount(@RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime, - @RequestParam(value = "goodsId", required = false) Set goodsId, - @RequestParam("orderId") Long organId) { - return success(orderService.plateCount()); + public CommonResult> getPlateCount(@RequestParam(value = "startTime") String startTime, + @RequestParam(value = "endTime") String endTime, + @RequestParam(value = "pageNo") Integer pageNo, + @RequestParam(value = "pageSize") Integer pageSize) { + return success(orderService.plateCount(startTime + " 00:00:00", endTime + " 23:59:59", pageNo, pageSize)); + } + + // 小板面积 <集合> + @GetMapping("/getPlateArea") + @Operation(summary = "小板数量") + @Parameters({ + @Parameter(name = "startTime", description = "开始时间", example = "2024-07-15"), + @Parameter(name = "endTime", description = "结束时间", example = "2024-07-16"), + @Parameter(name = "pageNo", description = "第几页", example = "1"), + @Parameter(name = "pageSize", description = "每页条数", example = "10") + }) + @PreAuthorize("@ss.hasPermission('productManager:List')") + public CommonResult> getPlateArea(@RequestParam(value = "startTime") String startTime, + @RequestParam(value = "endTime") String endTime, + @RequestParam(value = "pageNo") Integer pageNo, + @RequestParam(value = "pageSize") Integer pageSize) { + return success(orderService.plateArea(startTime + " 00:00:00", endTime + " 23:59:59", pageNo, pageSize)); } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java index e4209cf2a..efe243af2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java @@ -24,7 +24,7 @@ public class OrderRespVO { private String apiOrderId; @Schema(description = "生产单日期", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("交付日期") + @ExcelProperty("生产单日期") private LocalDateTime orderDate; @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatusRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatusRespVO.java index 5ba521ca6..547dc76ca 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatusRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderStatusRespVO.java @@ -3,6 +3,8 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 生产单状态统计") @Data @Builder @@ -15,4 +17,7 @@ public class OrderStatusRespVO { @Schema(description = "订单数量") private Integer orderCount; + + @Schema(description = "生产单时间") + private LocalDateTime orderDate; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index b9f63f201..55cb6bac2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -140,7 +140,7 @@ public interface OrderMapper extends BaseMapperX { List selectOrderIds(@Param(Constants.WRAPPER) Wrapper wrapper); // 生产单状态统计 - List selectOrderStatusCount(@Param("organId")Long organId, @Param("orderDate") LocalDateTime orderDate); + List selectOrderStatusCount(@Param("organId")Long organId, @Param("startTime")String startTime, @Param("endTime")String endTime); // 生产单预警统计 List selectOrderNear(@Param("today") LocalDateTime today, @Param("orderDate") LocalDateTime orderDate, @Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java index 9bd13eba0..f2aa7261b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java @@ -7,6 +7,7 @@ import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO; import org.apache.ibatis.annotations.Mapper; import java.math.BigDecimal; +import java.util.List; /** * 板材信息 Mapper plate @@ -25,9 +26,9 @@ public interface PlateGoodMapper extends BaseMapperX { } // 其他信息匹配 - default PlateGoodDO selectGood(String goodsName, String material, String color, Boolean texture, BigDecimal width, - BigDecimal thickness, BigDecimal height, String brand, String spec, Long organId) { - return selectOne(new LambdaQueryWrapper() + default List selectGood(String goodsName, String material, String color, Boolean texture, BigDecimal width, + BigDecimal thickness, BigDecimal height, String brand, String spec, Long organId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(PlateGoodDO::getGoodsName, goodsName) .eq(PlateGoodDO::getMaterial, material) .eq(PlateGoodDO::getColor, color) @@ -35,9 +36,15 @@ public interface PlateGoodMapper extends BaseMapperX { .eq(PlateGoodDO::getWidth, width) .eq(PlateGoodDO::getHeight, height) .eq(PlateGoodDO::getThickness, thickness) - .eq(PlateGoodDO::getBrand, brand) .eq(PlateGoodDO::getSpec, spec) .eq(PlateGoodDO::getDeleted, 0) - .eq(PlateGoodDO::getOrganId, organId)); - } + .eq(PlateGoodDO::getOrganId, organId); + if (brand == null) { + queryWrapper.eq(PlateGoodDO::getBrand,""); + }else { + queryWrapper.eq(PlateGoodDO::getBrand, brand); + } + return selectList(queryWrapper); + } + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index ce3d5f5f9..1a7b251e6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -137,5 +137,9 @@ public interface PlateMapper extends BaseMapperX { List selectGoodsNum(@Param("orderIds") List orderIds,@Param("organId") Long organId); // 小板数据分析 - List selectPlateAnalysisList(@Param("organId") Long organId, @Param("orderDate") LocalDateTime orderDate); +// List selectPlateAnalysisListByCount(@Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 数量 + IPage selectPlateAnalysisListByCount(@Param("page") IPage page, @Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 数量 +// List selectPlateAnalysisListByArea(@Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 面积 + IPage selectPlateAnalysisListByArea(@Param("page") IPage page, @Param("organId") Long organId, @Param("startTime") String startTime, @Param("endTime") String endTime); // 面积 + } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java index a57187a2b..02589ae4b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java @@ -96,13 +96,12 @@ public class OrderInputProcessor { * @param itemDOS */ @Transactional(rollbackFor = Exception.class) - public Long batchInsert(Collection rawGoodsDOS, Collection orderBodyDOS, + public void batchInsert(Collection rawGoodsDOS, Collection orderBodyDOS, Collection orderGroupDOS, Collection orderPartsDOS, Collection plateDOS, Collection orderModuleExtraDOS, - Collection itemDOS, OrderDO orderDO, + Collection itemDOS, Collection goodsDOS, Collection plateGoodDOS) { - if (orderDO != null) - orderMapper.insert(orderDO); + if (rawGoodsDOS != null) for (int i = 0; i < rawGoodsDOS.size(); i += 1000) { @@ -151,7 +150,6 @@ public class OrderInputProcessor { //plateMapper.insertBatch(plateDOS); //orderModuleExtraMapper.insertBatch(orderModuleExtraDOS); //orderItemMapper.insertBatch(itemDOS); - return orderDO.getId(); } /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 510a9d248..9c1c41e30 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -77,6 +77,7 @@ public interface OrderService { * @return List */ List getOrderBody(Long orderId); + String getOrderBodyToString(Long orderId); List getRoomAndBody(Long planId); @@ -140,7 +141,7 @@ public interface OrderService { /** * 文件数据导入 */ - void importExcelData(OrderDO orderDO, List list); + void importExcelData(OrderDO orderDO, List list, Integer index); /** * 模板文件导入保存 @@ -177,25 +178,13 @@ public interface OrderService { /** * 生产单状态统计 */ - List getOrderStatusCount(Integer startTerm); - - /** - * 小板数据分析统计 - */ - List getOrderPlateAnalysisCount(); + List getOrderStatusCount(String startTime, String endTime); /** * 生产单超期告警分析统计 */ Map> getOrderWarn(); - /** - * 今日要完成生产单数 - */ - List getOrderOverdue(); - - String getOrderBodyToString(Long orderId); - /** * 生产单总数统计 */ @@ -224,5 +213,10 @@ public interface OrderService { /** * 小板数量 */ - Integer plateCount(); + PageResult plateCount(String startTime, String endTime, Integer pageNo, Integer pageSize); + + /** + * 小板面积 + */ + PageResult plateArea(String startTime, String endTime, Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 4db2513ef..d58de7e6e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -280,7 +280,6 @@ public class OrderServiceImpl implements OrderService { // 判断生产单是否删除 Integer deleted = getOrderDeleted(orderId); - List orderBodyRespVOList = BeanUtils.toBean( orderBodyMapper.selectList(orderId, deleted, SecurityFrameworkUtils.getLoginUser().getOrganId()), OrderBodyRespVO.class); return orderBodyRespVOList; @@ -354,8 +353,35 @@ public class OrderServiceImpl implements OrderService { } @Override - public Integer plateCount() { - return null; + public PageResult plateCount(String startTime, String endTime, Integer pageNo, Integer pageSize) { +// 角色判断 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); +// 数据查询 + PageDTO page = new PageDTO<>(pageNo, pageSize); + IPage orderDetail; + if (loginUser.getIsSupAdmin()){ + orderDetail = plateMapper.selectPlateAnalysisListByCount(page,null, startTime, endTime); + }else { + orderDetail = plateMapper.selectPlateAnalysisListByCount(page,OrganContextHolder.getOrganId(), startTime, endTime); + } + PageResult pageResult = new PageResult(orderDetail.getRecords(), orderDetail.getTotal()); + return pageResult; + } + + @Override + public PageResult plateArea(String startTime, String endTime, Integer pageNo, Integer pageSize) { +// 角色判断 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); +// 数据查询 + PageDTO page = new PageDTO<>(pageNo, pageSize); + IPage orderDetail; + if (loginUser.getIsSupAdmin()){ + orderDetail = plateMapper.selectPlateAnalysisListByArea(page,null, startTime, endTime); + }else { + orderDetail = plateMapper.selectPlateAnalysisListByArea(page,OrganContextHolder.getOrganId(), startTime, endTime); + } + PageResult pageResult = new PageResult(orderDetail.getRecords(), orderDetail.getTotal()); + return pageResult; } @Override @@ -519,7 +545,10 @@ public class OrderServiceImpl implements OrderService { String nickName = SecurityFrameworkUtils.getLoginUser().getNickname(); OrderDO orderDO = order.get(0).setSalesman(nickName).setSplitter(nickName); - orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); + if (orderDO != null){ + orderMapper.insert(orderDO); + } + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, goodsDO, plateGoodDOS); List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); if (orderModelDOs.size() > 0) { @@ -546,18 +575,21 @@ public class OrderServiceImpl implements OrderService { List plateGoodLists = new ArrayList<>(); for (GoodsDO goodsDO : goodsLists) { - PlateGoodDO plateGoodDO; + PlateGoodDO plateGoodDO = null; + List plateGoodDOS = null; if (goodsDO.getGoodsId() != null) { // 有goodsId plateGoodDO = plateGoodMapper.selectGoodOne(goodsDO.getGoodsId(), SecurityFrameworkUtils.getLoginUser().getOrganId()); } else { // 没有goodsId 其他信息匹配 - plateGoodDO = plateGoodMapper.selectGood(goodsDO.getGoodsName(), goodsDO.getMaterial(), goodsDO.getColor(), - goodsDO.getTexture(), goodsDO.getWidth(), goodsDO.getWidth(), goodsDO.getHeight(), goodsDO.getSpec(), - goodsDO.getBrand(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + plateGoodDOS = plateGoodMapper.selectGood(goodsDO.getGoodsName(), goodsDO.getMaterial(), goodsDO.getColor(), + goodsDO.getTexture(), goodsDO.getWidth(), goodsDO.getThickness(), goodsDO.getHeight(), goodsDO.getBrand(), + goodsDO.getSpec(), SecurityFrameworkUtils.getLoginUser().getOrganId()); } - if (plateGoodDO != null) {//存在板材 - goodsDO.setGoodsId(plateGoodDO.getGoodsId()); + if (plateGoodDOS.size() > 0) {//存在板材 + goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId()); break; + } else if (plateGoodDO != null) { // 存在板材 + goodsDO.setGoodsId(plateGoodDO.getGoodsId()); } else { // 不存在板材 Long plateGoods = (Long) identifierGenerator.nextId(null); Long goodsId = (Long) identifierGenerator.nextId(null); @@ -576,7 +608,6 @@ public class OrderServiceImpl implements OrderService { } map.put("goodsDO", goodsLists); map.put("plateGoodDOLists", plateGoodLists); -// System.err.println(" map " + map); return map; } @@ -673,39 +704,12 @@ public class OrderServiceImpl implements OrderService { } @Override - public List getOrderStatusCount(Integer startTerm) { -// 根据开始条件选择 - LocalDateTime orderDate = null; - - if (startTerm != null){ - switch (startTerm) { - case 2: // 月 - orderDate = LocalDate.now().withDayOfMonth(1).atStartOfDay(); - break; - case 3: // 年 - orderDate = LocalDate.now().withMonth(1).withDayOfMonth(1).atStartOfDay(); - break; - default: // 周 - orderDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay(); - break; - - } - }else { - orderDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay(); - } - - List orderStatusRespVOS = orderMapper.selectOrderStatusCount(OrganContextHolder.getOrganId(), orderDate); + public List getOrderStatusCount(String startTime, String endTime) { + List orderStatusRespVOS = orderMapper.selectOrderStatusCount(OrganContextHolder.getOrganId(), startTime, endTime); orderStatusRespVOS.removeIf(obj -> obj.getOrderState() == OrderStatusEnum.EMPTY.getStatus()); return orderStatusRespVOS; } - @Override - public List getOrderPlateAnalysisCount() { - LocalDateTime orderDate = LocalDate.now().withDayOfMonth(1).atStartOfDay(); - List orderGoodsPlateRespVOS = plateMapper.selectPlateAnalysisList(OrganContextHolder.getOrganId(), orderDate); - return orderGoodsPlateRespVOS; - } - @Override public Map> getOrderWarn() { Map> map = new HashMap<>(); @@ -724,11 +728,6 @@ public class OrderServiceImpl implements OrderService { return map; } - @Override - public List getOrderOverdue() { - return null; - } - // 判断是否已经导入 private Boolean validateOrderNoExists(String orderNo, Long organId) { if (orderMapper.selectCount(new LambdaQueryWrapper() @@ -782,34 +781,39 @@ public class OrderServiceImpl implements OrderService { } @Override - public void importExcelData(OrderDO orderDO, List list) { - orderDO.setId((Long) snowFlakeGenerator.nextId(null)); + @Transactional(rollbackFor = Exception.class) + public void importExcelData(OrderDO orderDO, List list, Integer index) { + if (index == 0){ + orderDO.setId((Long) snowFlakeGenerator.nextId(null)); + orderMapper.insert(orderDO); + } - Map> listMap = excelTypeRealize.changeDate(list, orderDO.getId()); - List rawGoodsDO = (List) listMap.get("rawGoodsDOS"); - List goodsDO = (List) listMap.get("goodsDOS"); + if (list.size() > 0) { + Map> listMap = excelTypeRealize.changeDate(list, orderDO.getId()); + List rawGoodsDO = (List) listMap.get("rawGoodsDOS"); + List goodsDO = (List) listMap.get("goodsDOS"); // List plateGoodDOS = (List) listMap.get("plateGoodDOS"); - List bodyDO = (List) listMap.get("orderBodyDOS"); - List groupDO = (List) listMap.get("orderGroupDOS"); - List plateDO = (List) listMap.get("plateDOS"); - List partsDO = (List) listMap.get("orderPartsDOS"); - List itemDO = (List) listMap.get("orderItemDOS"); - List orderModelDOS = (List) listMap.get("orderModelDOS"); - List orderPartsRemarks = (List) listMap.get("orderPartsRemarks"); - // 板材库匹配 - Map> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在 - goodsDO = (List) map.get("goodsDO"); - List plateGoodDOS = (List) map.get("plateGoodDOLists"); + List bodyDO = (List) listMap.get("orderBodyDOS"); + List groupDO = (List) listMap.get("orderGroupDOS"); + List plateDO = (List) listMap.get("plateDOS"); + List partsDO = (List) listMap.get("orderPartsDOS"); + List itemDO = (List) listMap.get("orderItemDOS"); + List orderModelDOS = (List) listMap.get("orderModelDOS"); + List orderPartsRemarks = (List) listMap.get("orderPartsRemarks"); + // 板材库匹配 + Map> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在 excel + goodsDO = (List) map.get("goodsDO"); + List plateGoodDOS = (List) map.get("plateGoodDOLists"); // validateCustomOrderNoExists(orderDO.getCustomOrderNo()); - orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS); - if (orderModelDOS.size() > 0) { - orderInputProcessor.batchSaveModel(orderModelDOS); + orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, goodsDO, plateGoodDOS); + if (orderModelDOS.size() > 0) { + orderInputProcessor.batchSaveModel(orderModelDOS); + } + if (orderPartsRemarks.size() > 0) { + orderInputProcessor.batchSaveOrderPartsModel(orderPartsRemarks); + } } - if (orderPartsRemarks.size() > 0) { - orderInputProcessor.batchSaveOrderPartsModel(orderPartsRemarks); - } - } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java index 78bdc1244..4cb918a25 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java @@ -66,9 +66,9 @@ public class ExcelReadUtil { // 文件读取 } ); index.set(true); - if (MapUtil.isEmpty(orderMap) || CollectionUtil.isEmpty(list)) { - isErr.set(-1); - } +// if (MapUtil.isEmpty(orderMap) || CollectionUtil.isEmpty(list)) { +// isErr.set(-1); +// } map.put("order", orderMap); map.put("plate", list); return map; @@ -78,35 +78,56 @@ public class ExcelReadUtil { // 文件读取 // order 数据转换 public Map changeOrderDO(Map orderMap) { Map map = new HashMap<>(); - String s = (String) orderMap.get("出货日期"); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - // string 拼接 String error = ""; - // 电话校验 - if (!validatePhoneNumber((String) orderMap.get("客户电话"))) { - error += (String) orderMap.get("客户电话")+ "-客户电话格式错误；"; +// 判断是否为空 + if ( orderMap.get("客户") == null){ + error += "客户不能为空；"; } - if (!validatePhoneNumber((String) orderMap.get("经销商电话"))) { - error += (String) orderMap.get("经销商电话")+ "-经销商电话格式错误；"; + if (orderMap.get("经销商") == null){ + error += "经销商不能为空；"; + } + if (orderMap.get("客户地址") == null){ + error += "客户地址不能为空；"; + } + if (orderMap.get("出货日期") == null){ + error += "出货日期不能为空；"; + } + if (orderMap.get("客户电话") == null){ + error += "客户电话不能为空；"; + } else { + if (!validatePhoneNumber((String) orderMap.get("客户电话"))) { + error += orderMap.get("客户电话")+ "-客户电话格式错误；"; + } + } + if (orderMap.get("经销商电话") != null){ + if (!validatePhoneNumber((String) orderMap.get("经销商电话"))) { + error += orderMap.get("经销商电话")+ "-经销商电话格式错误；"; + } } OrderDO orderDO = OrderDO.builder() .organId(OrganContextHolder.getOrganId()) .dataType(0) - .customer((String) orderMap.get("客户")) + .customer((String) orderMap.get("客户")) // .customOrderNo((String) orderMap.get("自定义单号")) - .dealer((String) orderMap.get("经销商")) + .dealer((String) orderMap.get("经销商")) // .dealerPhoneNumber((String) orderMap.get("经销商电话")) - .address((String) orderMap.get("客户地址")) - .phoneNumber((String) orderMap.get("客户电话")) + .address((String) orderMap.get("客户地址")) // + .phoneNumber((String) orderMap.get("客户电话")) // .salesman((String) orderMap.get("业务员")) .splitter((String) orderMap.get("拆单员")) .remark((String) orderMap.get("备注")) .build(); - try { - LocalDate orderDate = LocalDate.parse(s, formatter); - orderDO.setDeliveryDate(orderDate.atStartOfDay()); - } catch (DateTimeParseException e) { - error += s + "-出货日期格式错误；"; + if (orderMap.get("出货日期") == null){ + error += "出货日期不能为空；"; + }else { + String s = (String) orderMap.get("出货日期"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + try { + LocalDate orderDate = LocalDate.parse(s, formatter); + orderDO.setDeliveryDate(orderDate.atStartOfDay()); // + } catch (DateTimeParseException e) { + error += s + "-出货日期格式错误；"; + } } map.put("order", orderDO); map.put("error", error); @@ -382,6 +403,13 @@ public class ExcelReadUtil { // 文件读取 errList.add("成品宽数据长度错误"); } } + + if (flag) { + Double plateHeight = Double.parseDouble(vo.getHeight()); + Double plateWidth = Double.parseDouble(vo.getWidth()); + vo.setArea(plateHeight * plateWidth * 0.000001); + } + if (!convertToDouble(vo.getSplitHeight())) { flag = false; errList.add("拆单长数据类型错误"); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java index 5ea91a3a4..9dbc1ad8c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java @@ -139,7 +139,6 @@ public class ExcelTypeRealize { excelVO -> excelVO.getRoomsName() != null ? excelVO.getRoomsName() : " ", Collectors.toList() )); - System.out.println("roomCollect " + roomCollect); roomCollect.forEach((roomName, listRoom) -> { Long roomId = (Long) snowFlakeGenerator.nextId(null); @@ -161,12 +160,12 @@ public class ExcelTypeRealize { // 加工组类型为条件进行分组 Map> synthesisCollect = listBody.stream() .collect(Collectors.groupingBy( - excelVO -> excelVO.getSynthesis() != null ? excelVO.getSynthesis() : " ", + excelVO -> excelVO.getSynthesisTypeName() != null ? excelVO.getSynthesisTypeName() : " ", Collectors.toList() )); Long groupTypeId = (Long) snowFlakeGenerator.nextId(null); - synthesisCollect.forEach((synthesis, listSynthesis) -> { + synthesisCollect.forEach((synthesisTypeName, listSynthesis) -> { // 加工组名称为条件进行分组 Map> combinationNameCollect = listSynthesis.stream() .collect(Collectors.groupingBy( @@ -174,12 +173,12 @@ public class ExcelTypeRealize { Collectors.toList() )); combinationNameCollect.forEach((combinationName, listCombinationName) -> { - Long groupId = (Long) snowFlakeGenerator.nextId(null); // 板数量 final Double[] plateCountByCombination = {0.0}; - OrderGroupDO orderGroupDO = OrderGroupDO.builder().id(groupId).orderId(orderId).organId(organId).bodyId(bodyId) - .groupTypeId(groupTypeId).groupTypeName(synthesis).name(combinationName).width(0.0).height(0.0) - .depth(0.0).multiNum(0).plateNum(0).unregularNum(0).filename("无").remark("无").build(); + Long groupId = (Long) snowFlakeGenerator.nextId(null); + OrderGroupDO orderGroupDO = OrderGroupDO.builder().id(groupId).orderId(orderId).organId(organId).bodyId(bodyId) + .groupTypeId(groupTypeId).groupTypeName(synthesisTypeName).name(combinationName != " " ? combinationName : synthesisTypeName).width(0.0).height(0.0) + .depth(0.0).multiNum(0).plateNum(0).unregularNum(0).filename("无").remark("无").build(); listCombinationName.forEach(combination -> { @@ -207,7 +206,7 @@ public class ExcelTypeRealize { .plateNo(combination.getPlateNo()) .goodsId(combination.getGoodId()) .width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth()))) - .plateNo(((obtainingTime)+ Long.toString(plateNo).substring(2))) + .plateNo(((obtainingTime) + Long.toString(plateNo).substring(2))) .height(BigDecimal.valueOf(Double.parseDouble(combination.getHeight()))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) .splitWidth(BigDecimal.valueOf(Double.parseDouble(combination.getSplitWidth()))) @@ -229,7 +228,7 @@ public class ExcelTypeRealize { OrderItemDO orderItemDO = OrderItemDO.builder().orderId(orderId).type(OrderItemTypeEnum.PLATE_ITEM.getStatus()) .roomId(roomId).bodyId(bodyId).plateId(plateId) - .num(1.0).groupId(groupId).build(); + .num(1.0).groupId(synthesisTypeName != " " ? groupId : null).build(); orderItemDOS.add(orderItemDO); orderModelDOS.add(OrderModelDO.builder().orderId(orderId).plateId(plateId) .typographicFace(Integer.valueOf(typographyDTO.getValue())).build()); @@ -249,14 +248,14 @@ public class ExcelTypeRealize { .remark(remarkExtract(combination.remarkJSON())).build(); orderPartsRemarks.add(orderPartsRemark); OrderItemDO orderItemDO = OrderItemDO.builder().orderId(orderId).type(OrderItemTypeEnum.PARTS_ITEM.getStatus()) - .roomId(roomId).bodyId(bodyId).partsId(partsId).groupId(groupId) + .roomId(roomId).bodyId(bodyId).partsId(partsId).groupId(synthesisTypeName != " " ? groupId : null) .num(Double.valueOf(combination.getGoodsNumber())).build(); orderItemDOS.add(orderItemDO); } }); orderGroupDO.setPlateNum(plateCountByCombination[0].intValue()); - if (orderGroupDO.getName() != null && !orderGroupDO.getName().trim().isEmpty()) { + if (orderGroupDO.getGroupTypeName() != null && !orderGroupDO.getGroupTypeName().trim().isEmpty()) { orderGroupDOS.add(orderGroupDO); } }); @@ -279,8 +278,8 @@ public class ExcelTypeRealize { map.put("orderModuleExtraDOS", orderModuleExtraDOS); map.put("orderModelDOS", orderModelDOS); map.put("orderPartsRemarks", orderPartsRemarks); - System.out.println(" goodsDOS " + goodsDOS); - System.out.println(" rawGoodsDOS " + rawGoodsDOS); + System.out.println(" orderGroupDOS " + orderGroupDOS); + System.out.println(" orderItemDOS " + orderItemDOS); return map; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java index 1359180e0..a6d2cf06c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java @@ -102,12 +102,12 @@ public class OrderPlateImportExcelVO { @JsonIgnore private String cabinetsName; - @ExcelProperty(value = "加工组类型") + @ExcelIgnore @JsonIgnore private String synthesis; @JsonIgnore - @ExcelIgnore + @ExcelProperty(value = "加工组类型") private String synthesisTypeName;//加工组类型的名称 @ExcelProperty(value = "加工组名称") @@ -208,6 +208,10 @@ public class OrderPlateImportExcelVO { @ExcelIgnore private String remark; + @JsonIgnore + @ExcelIgnore + private Double area; //面积 + //备注转json数据 public String remarkJSON() { ObjectMapper objectMapper = new ObjectMapper(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index 32febc1dc..873649a30 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -84,12 +84,13 @@ - SELECT MIN(g.brand) AS brand, @@ -626,10 +626,50 @@ LEFT JOIN order_plate a ON g.id = a.goods_id AND g.organ_id = a.organ_id LEFT JOIN orders o ON o.id = a.order_id WHERE - o.organ_id = #{organId} - AND a.deleted = 0 - AND DATE(o.order_date) >= #{orderDate} + a.deleted = 0 + AND DATE(o.order_date) BETWEEN #{startTime} AND #{endTime} + + AND o.organ_id = #{organId} + GROUP BY g.goods_id + HAVING + SUM(a.area) > 0 + ORDER BY + orderCount DESC; + + + \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel.xlsx b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel.xlsx index 792dd801d..2e85122db 100644 Binary files a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel.xlsx and b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel.xlsx differ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel_err.xlsx b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel_err.xlsx index dfc6ef8e7..f171ef9a6 100644 Binary files a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel_err.xlsx and b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/order_add_excel_err.xlsx differ