diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 5bd4c002c..ec6be92c2 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -124,12 +124,12 @@ public class PurApplyController { } else { purApplyService.update(purApplyEntity); } - if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) { - for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) { - purApplyDetailEntity.setId(null); - purApplyDetailService.insert(purApplyDetailEntity); - } - } +// if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) { +// for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) { +// purApplyDetailEntity.setId(null); +// purApplyDetailService.insert(purApplyDetailEntity); +// } +// } return ResultVOUtils.success("提交成功！"); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 7fe280507..600748539 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -720,16 +720,15 @@ public class PurOrderReceiveController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + String bagId = addReceiveDetailRequest.getBagId(); + if (StringUtils.isEmpty(bagId)) return ResultVOUtils.error(500, "未选择术式套包信息"); AuthAdmin authAdmin = getUser(); String orderNo = addReceiveDetailRequest.getPurReceiveEntity().getBillNo(); - if (addReceiveDetailRequest.getPurReceiveEntity() == null) + if (addReceiveDetailRequest.getPurReceiveEntity() == null){ return ResultVOUtils.error(500, "未指定订单"); - if (StringUtils.isEmpty(addReceiveDetailRequest.getBagId())) { - return ResultVOUtils.error(500, "未选择术式套包信息"); }else { - String bagId = addReceiveDetailRequest.getBagId(); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setDestinyId(bagId + ""); + filterUdiRelRequest.setDestinyId(bagId); filterUdiRelRequest.setDiType(1); List list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); if (CollUtil.isEmpty(list)) throw new JsonException("术式套包数据为空！"); @@ -773,6 +772,7 @@ public class PurOrderReceiveController extends BaseController { purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo()); purReceiveDetailEntity.setPrice(detaiData.getPrice()); purReceiveDetailEntity.setSupId(detaiData.getSupId()); + purReceiveDetailEntity.setDestinyId(bagId); receivedetailService.insert(purReceiveDetailEntity); } purReceiveEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 371c59d68..167a592fd 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -230,4 +230,9 @@ public class IoOrderDetailBizEntity { @TableField(value = "regStatus") private boolean regStatus; + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; } diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java index 6fb58cf99..4af342762 100644 --- a/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java @@ -56,6 +56,13 @@ public class PurReceiveDetailEntity { @TableField(value = "price") private BigDecimal price; + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; + + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java index 3d6f1f102..ef9ca7844 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java @@ -48,4 +48,10 @@ public class PurApplyDetailEntity { @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; + } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index 6bb2247e5..d7b3210a5 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -56,6 +56,12 @@ public class PurOrderDetailEntity { @TableField(exist = false) private String supName; + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java index 6216823ea..4fb918285 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java @@ -48,6 +48,12 @@ public class PurPlanDetailEntity { @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; @@ -61,4 +67,4 @@ public class PurPlanDetailEntity { public static final String COL_SUPID = "supId"; public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java index f84008d1f..1d7cfe85f 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; @@ -56,4 +57,11 @@ public class PurOrderDetailResponse { private String nameCode; private String spmc; + + + /** + * 定数包模板id + */ + @TableField(value = "destinyId") + private String destinyId; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 11ac5c721..dc25783f8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -307,6 +307,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { ioOrderDetailBizEntity.setBatchNo(item.getBatchNo()); ioOrderDetailBizEntity.setSupId(item.getSupId()); ioOrderDetailBizEntity.setCount(item.getCount()); + ioOrderDetailBizEntity.setDestinyId(pId); if (null == item.getZczbhhzbapzbh() || "".equals(item.getZczbhhzbapzbh())) { ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); } else { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java index 8b1ba5065..2899aaab8 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java @@ -113,7 +113,7 @@ public class PurApplyDetailService extends ServiceImpl list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); @@ -126,6 +126,7 @@ public class PurApplyDetailService extends ServiceImpl - replace - INTO pur_apply_detail - (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh) + replace INTO pur_apply_detail + (orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh,destinyId) values (#{orderIdFk}, #{productId}, #{productName}, #{count}, - #{supId}, #{zczbhhzbapzbh}) + #{supId}, #{zczbhhzbapzbh}, #{destinyId}) diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index d07e0555a..8bc93107c 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -57,15 +57,14 @@ replace INTO pur_plan_detail ( - orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh + orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh,destinyId ) values ( #{orderIdFk}, #{productId}, #{productName}, #{count}, - #{supId},#{zczbhhzbapzbh} - ) + #{supId},#{zczbhhzbapzbh},#{destinyId}) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 66e036a7b..a0521c99e 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2025,3 +2025,23 @@ CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'deptCode', INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'destinyId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''', + 1); + +CALL Pro_Temp_ColumnWork('pur_apply_detail', 'destinyId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''', + 1); + +CALL Pro_Temp_ColumnWork('pur_order_detail', 'destinyId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''', + 1); + +CALL Pro_Temp_ColumnWork('pur_plan_detail', 'destinyId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''', + 1); + +CALL Pro_Temp_ColumnWork('pur_receive_detail', 'destinyId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''', + 1);