From 387de1e86a0d55142f948a2d08ec178e60a98516 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Mon, 17 Jun 2024 16:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BAorders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderController.java | 12 ++---- .../admin/plate/vo/PlateGoodsRespVO.java | 9 ++++ .../dal/dataobject/order/OrderDO.java | 2 +- .../executor/dal/mysql/order/OrderMapper.java | 6 +-- .../mysql/orderParts/OrderPartsMapper.java | 4 +- .../executor/dal/mysql/plate/PlateMapper.java | 6 ++- .../executor/service/order/OrderService.java | 2 +- .../service/order/OrderServiceImpl.java | 42 +++++++++++-------- .../admin/api/webcad/ApiTypeRealize.java | 19 ++++++++- .../admin/files/excel/ExcelReadUtil.java | 2 + .../resources/mapper/order/OrderMapper.xml | 2 +- .../mapper/orderParts/OrderPartsMapper.xml | 25 +++++++++-- .../main/resources/mapper/plan/PlanMapper.xml | 2 +- .../resources/mapper/plate/PlateMapper.xml | 10 ++++- .../dal/dataobject/process/OrderDO.java | 2 +- .../dal/mysql/plate/OrderPlateMapper.xml | 4 +- .../dal/mysql/process/ProcessStepMapper.xml | 2 +- .../mysql/process/ProductionProcessMapper.xml | 2 +- .../mysql/query/ProductionStatusMapper.xml | 6 +-- 19 files changed, 108 insertions(+), 51 deletions(-) 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 6230def9b..2ce19340d 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 @@ -24,21 +24,17 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.*; import javax.servlet.http.*; -import java.io.*; -import java.net.URLEncoder; import java.util.*; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.pojo.CommonResult.success; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*; -import static com.cf.imes.module.executor.enums.ErrorCodeConstants.*; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.module.executor.service.order.OrderService; @@ -47,14 +43,10 @@ import com.cf.imes.module.executor.service.order.OrderService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; @Tag(name = "管理后台 - 生产单管理") @@ -117,7 +109,7 @@ public class OrderController { @Operation(summary = "还原") @Parameter(name = "orderId", description = "生产单id", required = true, example = "1") @PreAuthorize("@ss.hasPermission('executor:order:restore')") - public CommonResult restoreOrder(@RequestParam("orderId") Long orderId) { + public CommonResult restoreOrder(@Valid @RequestBody Long orderId) { orderService.restoreOrder(orderId); return success(true); } @@ -254,6 +246,7 @@ 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) { // 文件为空 @@ -261,6 +254,7 @@ public class OrderController { return; }else if (excelReadUtil.isErr() > 0) { // 返回文件 + System.out.println("(Map) " + (Map) map.get("order")+ " , (List)" +(List) map.get("plate")); ExcelWriterUtil.write(response, (Map) map.get("order"), (List) map.get("plate"),orderService.getSavePath()+ "\\"+ "生产单Excel导入错误导出模板.xlsx"); return; } else { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java index 78596d3be..0c04769f7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java @@ -34,6 +34,9 @@ public class PlateGoodsRespVO { @Schema(description = "板id", example = "11087") private Long id; + @Schema(description = "板数量", example = "11087") + private Integer count = 1; + @Schema(description = "生产单号", example = "11087") private Long orderId; @@ -151,6 +154,12 @@ public class PlateGoodsRespVO { @Schema(description = "是否孤形对角") private Boolean isArcAcross; + @Schema(description = "是否异性") + private Boolean isSpecialShaped; + + @Schema(description = "是否造型") + private Boolean isSculpt; + @Schema(description = "模块类型 ID", example = "12800") private Long moduleTypeId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java index 822d4430b..216fc1d01 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java @@ -14,7 +14,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; * * @author 晨丰科技 */ -@TableName("`order`") +@TableName("`orders`") @KeySequence("order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) 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 703d039d7..edf76140c 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 @@ -36,11 +36,11 @@ public interface OrderMapper extends BaseMapperX { .eqIfPresent(OrderDO::getOrderSort, reqVO.getOrderSort()) .eqIfPresent(OrderDO::getDataType, reqVO.getDataType()) .eqIfPresent(OrderDO::getStatus, reqVO.getStatus()) - .eqIfPresent(OrderDO::getCustomOrderNo, reqVO.getCustomOrderNo()) + .likeIfPresent(OrderDO::getCustomOrderNo, reqVO.getCustomOrderNo()) .eqIfPresent(OrderDO::getCustomer, reqVO.getCustomer()) - .eqIfPresent(OrderDO::getAddress, reqVO.getAddress()) + .likeIfPresent(OrderDO::getAddress, reqVO.getAddress()) .eqIfPresent(OrderDO::getPhoneNumber, reqVO.getPhoneNumber()) - .eqIfPresent(OrderDO::getDealer, reqVO.getDealer()) + .likeIfPresent(OrderDO::getDealer, reqVO.getDealer()) .eqIfPresent(OrderDO::getDealerPhoneNumber, reqVO.getDealerPhoneNumber()) .eqIfPresent(OrderDO::getSalesman, reqVO.getSalesman()) .eqIfPresent(OrderDO::getSplitter, reqVO.getSplitter()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java index 4d4c4b9b6..99fe09618 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java @@ -67,9 +67,9 @@ public interface OrderPartsMapper extends BaseMapperX { IPage selectProductList(@Param("page") IPage page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId")Long organId); - List selectPartDetail(@Param("orderId") Long orderId, @Param("organId") Long organId);// 配件明细 + List selectPartDetail(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);// 配件明细 - List selectPartAll(@Param("orderId") Long orderId, @Param("organId") Long organId);// 配件汇总 + List selectPartAll(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);// 配件汇总 // 单个修改删除状态 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 c183561a3..e7ea50334 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 @@ -89,9 +89,9 @@ public interface PlateMapper extends BaseMapperX { List selectPlateDetialListByIds(@Param("orderIds") List orderIds,@Param("organId") Long organId); - List selectPlateGoodsList(@Param("orderId") Long orderId, @Param("organId") Long organId); // 明细 + List selectPlateGoodsList(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); // 明细 - List selectPlateGoodsListSummary(@Param("orderId") Long orderId, @Param("organId") Long organId); // 汇总 + List selectPlateGoodsListSummary(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); // 汇总 // 单个修改删除状态 @@ -106,4 +106,6 @@ public interface PlateMapper extends BaseMapperX { } void updateDeletedById(@Param("bodyId") Long bodyId, @Param("deleted") Integer deleted, @Param("organId") Long organId); + + int countPlateByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); } \ 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/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 50aaf4492..44bce53f6 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 @@ -56,7 +56,7 @@ public interface OrderService { * * @param orderId 编号组 */ - void restoreOrder(Long orderId); + void restoreOrder(@Valid Long orderId); /** * 获得生产单表 order_{N} 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 7c0a8041f..a0143389b 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 @@ -139,7 +139,7 @@ public class OrderServiceImpl implements OrderService { public Long createOrder(OrderSaveReqVO createReqVO) { //校验手机号是否合法 validatePhoneNumber(createReqVO.getPhoneNumber()); - validatePhoneNumber(createReqVO.getDealerPhoneNumber()); + //验证自定义单号是否存在，业务员、拆单员是否存在 validateOrderImportForCreateOrUpdate(createReqVO.getCustomOrderNo(), createReqVO.getSalesman(), createReqVO.getSplitter()); @@ -159,7 +159,7 @@ public class OrderServiceImpl implements OrderService { //校验手机号是否合法 validatePhoneNumber(updateReqVO.getPhoneNumber()); - validatePhoneNumber(updateReqVO.getDealerPhoneNumber()); + //验证自定义单号是否存在，业务员、拆单员是否存在 validateOrderImportForCreateOrUpdate(updateReqVO.getCustomOrderNo(), updateReqVO.getSalesman(), updateReqVO.getSplitter()); @@ -238,15 +238,19 @@ public class OrderServiceImpl implements OrderService { throw exception(ORDER_NOT_EXISTS); } // 判断生产单是否删除 - Integer deleted; - if (OrderDeletedEnum.NOT_DELETED.equals(orderDO.getDeleted() == false ? 0 : 1)) - deleted = OrderDeletedEnum.NOT_DELETED.getStatus(); - else - deleted = OrderDeletedEnum.DELETED.getStatus(); - System.out.println(" deleted " + deleted); - return deleted; + return getOrderStatus(orderDO.getDeleted()); } + private Integer getOrderStatus(Boolean deleted) { + // 判断生产单是否删除 + Integer index; + if (OrderDeletedEnum.NOT_DELETED.equals(deleted == false ? 0 : 1)) + index = OrderDeletedEnum.NOT_DELETED.getStatus(); + else + index = OrderDeletedEnum.DELETED.getStatus(); + System.out.println(" deleted " + deleted); + return index; + } @Override public List getOrderBody(Long orderId) { // 判断生产单是否删除 @@ -567,37 +571,41 @@ public class OrderServiceImpl implements OrderService { if (orderDO == null) { throw exception(ORDER_NOT_EXISTS); } - return getDataByOrderIdAndType(orderDO, type); + return getDataByOrderIdAndType(orderDO, type, getOrderDeleted(orderId)); } // 根据ype 与 orderId获取相关信息 - public Map getDataByOrderIdAndType(OrderDO orderDO, String type) { + public Map getDataByOrderIdAndType(OrderDO orderDO, String type,Integer deleted) { Map map = new HashMap<>(); map.put("orderDO", orderDO); switch (type) { case "配件明细1-模板.xlsx":// 配件明细 - map.put("partsListDetail", orderPartsMapper.selectPartDetail(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("partsListDetail", orderPartsMapper.selectPartDetail(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
配件明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体名表数据源
名称品牌厂家型号规格数量单位备注
小计：
合计：
"); break; case "配件汇总1-模板.xlsx":// 配件汇总 - map.put("partsSummary", orderPartsMapper.selectPartAll(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("partsSummary", orderPartsMapper.selectPartAll(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
配件汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
名称型号规格数量单位品牌备注
"); break; case "板材明细-按房间-模板.xlsx": - map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名数据源柜体数据源列表条数表达式
板编号板名称材料颜色长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put("plateCount", plateMapper.countPlateByOrderId(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); break; case "板材明细-按板材-模板.xlsx": - map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("plateListDetail", plateMapper.selectPlateGoodsList(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
板材明细单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源列表条数表达式
房名柜名板编号板名称长宽厚度面积异形造型左/右/上/下开门类型备注
小计：小计面积表达式
合计：合计面积表达式
"); + map.put("plateCount", plateMapper.countPlateByOrderId(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); break; case "板材汇总-按房间-模板.xlsx": - map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
板材汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
房间名称数据源柜体数据源列表条数表达式
板名称材料颜色长宽厚度数量面积开门类型
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put("plateCount", plateMapper.countPlateByOrderId(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); break; case "板材汇总-按板材-模板.xlsx": - map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId())); + map.put("plateSummary", plateMapper.selectPlateGoodsListSummary(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); map.put("table", "SheetJS Table Export
板材汇总单
生产单号:自定单号:经销商:订单日期：
客户:收货电话:收货地址:收货日期：
备注:
板材名称数据源板材颜色数据源板材厚度数据源
房名柜名板名称长宽数量面积开门类型备注
小计：数量表达式面积表达式
合计：数量表达式面积表达式
"); + map.put("plateCount", plateMapper.countPlateByOrderId(orderDO.getId(), SecurityFrameworkUtils.getLoginUser().getOrganId(), deleted)); break; default: // 处理默认情况，可以选择忽略或者做其他处理 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index 30ddbf3c5..bfd9ddf29 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; @@ -400,7 +401,7 @@ public class ApiTypeRealize { .unit(parts.getString("Units")) .price(parts.getDouble("Price")) .isComposite(parts.getBoolean("IsComposite")) - .remark(parts.getString("SpecExtras")) + .remark(partsRemarkChange(parts)) .build(); partsInfos.put(parts.getInteger("DataID"), partsInfo); @@ -426,6 +427,22 @@ public class ApiTypeRealize { return map; } + // 配件备注集合 + private String partsRemarkChange(JSONObject value) { + List> mapList = new ArrayList<>(); + if (value != null && !value.isEmpty()) { + Map map = new HashMap<>(); + map.put("Remark", value.getString("Remark")); + map.put("SpecExtras", value.getString("SpecExtras")); + map.put("SpecialRemark", value.getString("SpecialRemark")); + map.put("DoorRemark", value.getString("DoorRemark")); + map.put("HingeRemark", value.getString("HingeRemark")); + mapList.add(map); + } + // 转String + String remark = JSON.toJSONString(mapList); + return remark; + } /** * 板材信息转换 写表 Integer指板材的ItemID板id 加一个板材自定义编号 */ 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 703f60207..86e2b8e64 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 @@ -70,6 +70,8 @@ public class ExcelReadUtil { // 文件读取 map.put("order", orderMap); if (orderMap.size() == 0) isErr = -1; + if (list.size() == 0) + isErr = -1; map.put("plate", list); return map; 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 5a798746b..b5c3bd75e 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 @@ -5,7 +5,7 @@ - SELECT a.id, a.goods_id, a.name, a.material, a.type, a.model, a.spec, a.brand, a.factory, - a.unit, a.price, a.is_composite, a.remark, b.num, c.name as body_name, c.id as body_id, - c.room_id, c.room_name, b.num * a.price AS total_price -- 添加计算总金额的列 + SELECT a.id, + a.goods_id, + a.name, + a.material, + a.type, + a.model, + a.spec, + a.brand, + a.factory, + a.unit, + a.price, + a.is_composite, + a.remark, + b.num, + c.name as body_name, + c.id as body_id, + c.room_id, + c.room_name, + b.num * a.price AS total_price -- 添加计算总金额的列 FROM order_parts a LEFT JOIN order_item b ON a.id = b.parts_id LEFT JOIN order_body c on c.id = b.body_id WHERE b.order_id = #{orderId} and b.organ_id = #{organId} + and a.deleted = #{deleted} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 9d4a96aba..76f6fe4c0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -11,7 +11,7 @@ from order_plate a LEFT JOIN order_item oi on a.id = oi.plate_id and a.order_id = oi.order_id and a.organ_id = oi.organ_id - LEFT JOIN `order` b on a.order_id = b.id and a.organ_id = b.organ_id + LEFT JOIN `orders` b on a.order_id = b.id and a.organ_id = b.organ_id LEFT JOIN order_goods c on a.goods_id = c.id and a.organ_id = c.organ_id left join order_plan_item opi on oi.id = opi.item_id and oi.organ_id = opi.organ_id @@ -216,6 +216,8 @@ op.width, op.thickness, op.area, + op.is_special_shaped, + op.is_sculpt, ogs.price, ogs.brand, ogs.height as goods_height, @@ -235,6 +237,7 @@ left join order_goods gods on gods.id = op.goods_id where op.order_id = #{orderId} and op.organ_id = #{organId} + and op.deleted = #{deleted} @@ -271,4 +275,8 @@ WHERE body_id = #{bodyId} AND organ_id = #{organId} ) + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java index b55243b04..98fe0a45e 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -@TableName(value = "`order`") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users +@TableName(value = "`orders`") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml index cfb6b6f0d..cb871055c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml @@ -58,7 +58,7 @@ join order_item oi on op.id = oi.plate_id join order_body ob on oi.body_id = ob.id - join `order` o on op.order_id = o.id + join `orders` o on op.order_id = o.id join plate p on op.goods_id = p.goods_id @@ -123,7 +123,7 @@ join order_item oi on op.id = oi.plate_id join order_body ob on oi.body_id = ob.id - join `order` o on op.order_id = o.id + join `orders` o on op.order_id = o.id join plate p on op.goods_id = p.goods_id where op.id = #{plateId} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml index 7b4cd8322..e33eec164 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml @@ -46,7 +46,7 @@ ops.processinfo_id as processID, ops.type as processType from order_process_step ops - join `order` o on ops.order_id = o.id and ops.organ_id = o.organ_id + join `orders` o on ops.order_id = o.id and ops.organ_id = o.organ_id join order_process_step_item opsi on ops.id = opsi.process_step_id and ops.organ_id = opsi.organ_id diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml index 31265840b..b872193d6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml @@ -41,7 +41,7 @@ p.material as material, p.color as color - from `order` o + from `orders` o join order_item oi on o.id = oi.order_id join order_plate op on oi.plate_id = op.id diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index d9de9218c..7c16c2fba 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -26,7 +26,7 @@ o.phone_number as customerPhone, count(opn.order_id) as packageQuantity - from `order` o + from `orders` o join order_package opn on o.id = opn.order_id and o.organ_id = opn.organ_id where o.id = #{orderNo} and opn.status <> 0 and o.organ_id = #{organId} ; @@ -85,7 +85,7 @@ when oi.plate_id !=0 then oi.plate_id end )as totalPieceCount - FROM `order` o + FROM `orders` o join order_item oi on o.id = oi.order_id and o.organ_id = oi.organ_id WHERE @@ -126,7 +126,7 @@ o.address as address, ((SELECT COUNT(t2.id) FROM order_package t2 WHERE t2.create_time <= opn.create_time and t2.order_id =#{orderNo})) as packNum - from `order` o + from `orders` o join order_package opn on o.id = opn.order_id and o.organ_id = opn.organ_id where opn.order_id =#{orderNo} and opn.id = #{packageNo} and opn.status <> 0 and opn.organ_id = #{organId}