From a58e9e62298df4a4fb291dedacb58d0fedf1ab01 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 4 Apr 2024 22:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/RedissonCacheKey.java | 5 +++ .../inv/InvCountOrderController.java | 5 ++- .../entity/inv/InvCountOrderDetailEntity.java | 39 +++++++++++-------- .../api/service/inv/InvCountOrderService.java | 18 ++++----- src/main/resources/schemas/schema_v2.4.sql | 5 +++ 5 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/RedissonCacheKey.java b/src/main/java/com/glxp/api/constant/RedissonCacheKey.java index d8a967988..061a4d553 100644 --- a/src/main/java/com/glxp/api/constant/RedissonCacheKey.java +++ b/src/main/java/com/glxp/api/constant/RedissonCacheKey.java @@ -55,4 +55,9 @@ public interface RedissonCacheKey { */ String DL_SICKER_PRECRIBE = "dl_sicker_precribe"; + /** + * 盘点提交单据 + */ + String INV_COUNT_SUBMIT_ORDER = "inv_count_submit_order"; + } diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index da8278ca7..e70f93f64 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -7,11 +7,13 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; +import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inv.InvCountOrderEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; @@ -118,8 +120,9 @@ public class InvCountOrderController extends BaseController { * * @return */ - @Log(title = "提交审核") + @Log(title = "盘点提交审核") @PostMapping("/invCount/order/submitAudit") + @CusRedissonAnnotation(cacheName = RedissonCacheKey.INV_COUNT_SUBMIT_ORDER, key = {"#invCountOrderEntity.orderId"}, timeOutMsg = "系统正在处理，请勿重复提交") public BaseResponse submitAudit(@RequestBody InvCountOrderEntity invCountOrderEntity) { if (StrUtil.isBlank(invCountOrderEntity.getOrderId())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java index 2898f07ed..f33c0cd6d 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java @@ -6,16 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; /** - * 盘点单详情 - */ -@ApiModel(value="com-glxp-api-entity-inv-InvCountOrderDetail") + * 盘点单详情 + */ +@ApiModel(value = "com-glxp-api-entity-inv-InvCountOrderDetail") @Data @Builder @AllArgsConstructor @@ -26,92 +28,97 @@ public class InvCountOrderDetailEntity implements Serializable { * id */ @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="id") + @ApiModelProperty(value = "id") private Integer id; /** * 盘点单号 */ @TableField(value = "orderIdFk") - @ApiModelProperty(value="盘点单号") + @ApiModelProperty(value = "盘点单号") private String orderIdFk; /** * 产品ID */ @TableField(value = "productId") - @ApiModelProperty(value="产品ID") + @ApiModelProperty(value = "产品ID") private String productId; /** * 产品DI */ @TableField(value = "nameCode") - @ApiModelProperty(value="产品DI") + @ApiModelProperty(value = "产品DI") private String nameCode; /** * 批次号 */ @TableField(value = "batchNo") - @ApiModelProperty(value="批次号") + @ApiModelProperty(value = "批次号") private String batchNo; /** * 生产日期 */ @TableField(value = "produceDate") - @ApiModelProperty(value="生产日期") + @ApiModelProperty(value = "生产日期") private String produceDate; /** * 失效日期 */ @TableField(value = "expireDate") - @ApiModelProperty(value="失效日期") + @ApiModelProperty(value = "失效日期") private String expireDate; /** * 序列号 */ @TableField(value = "serialNo") - @ApiModelProperty(value="序列号") + @ApiModelProperty(value = "序列号") private String serialNo; /** * 盘点数量 */ @TableField(value = "countNum") - @ApiModelProperty(value="盘点数量") + @ApiModelProperty(value = "盘点数量") private Integer countNum; /** * 账面数量 */ @TableField(value = "invNum") - @ApiModelProperty(value="账面数量") + @ApiModelProperty(value = "账面数量") private Integer invNum; /** * 盘盈数量 */ @TableField(value = "profitNum") - @ApiModelProperty(value="盘盈数量") + @ApiModelProperty(value = "盘盈数量") private Integer profitNum; /** * 盘亏数量 */ @TableField(value = "lossNum") - @ApiModelProperty(value="盘亏数量") + @ApiModelProperty(value = "盘亏数量") private Integer lossNum; /** * 盈亏状态 0：亏损 1：盈利 */ @TableField(value = "`status`") - @ApiModelProperty(value="盈亏状态 0：亏损 1：盈利") + @ApiModelProperty(value = "盈亏状态 0：亏损 1：盈利") private Integer status; + /** + * 供应商ID + */ + @TableField(value = "`supId`") + private String supId; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java index 8293e4a0d..0c8635136 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java @@ -502,13 +502,13 @@ public class InvCountOrderService extends ServiceImpl 0) { IoCodeTempEntity warehouseEntity = buildCodeEntity(invCountOrderDetail, invCountOrder, ConstantType.TYPE_OUT); - warehouseEntity.setSupId(getSupId(warehouseEntity)); + warehouseEntity.setSupId(invCountOrderDetail.getSupId()); lossCodesList.add(warehouseEntity); } if (IntUtil.value(invCountOrderDetail.getProfitNum()) > 0) { IoCodeTempEntity warehouseEntity = buildCodeEntity(invCountOrderDetail, invCountOrder, ConstantType.TYPE_PUT); - warehouseEntity.setSupId(getSupId(warehouseEntity)); + warehouseEntity.setSupId(invCountOrderDetail.getSupId()); profitCodesList.add(warehouseEntity); } } @@ -704,13 +704,13 @@ public class InvCountOrderService extends ServiceImpl supIds = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + ""); - if (CollUtil.isNotEmpty(supIds) && supIds.size() == 1) { - return supIds.get(0); - } - return null; - } +// private String getSupId(IoCodeTempEntity warehouseEntity) { +// List supIds = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + ""); +// if (CollUtil.isNotEmpty(supIds) && supIds.size() == 1) { +// return supIds.get(0); +// } +// return null; +// } public InvCountOrderEntity selectByOrderId(String orderId) { return invCountOrderDao.selectByOrderId(orderId); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 7b52eea79..4c60b9991 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1902,6 +1902,11 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'genStatus', CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1); +CALL Pro_Temp_ColumnWork('inv_count_order_detail', 'supId', + ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''供应商ID''', + 1); + + CREATE TABLE IF NOT EXISTS thr_consume_material_category (