bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 食堂修改入库新增时单价为999 问题解决

This commit is contained in:
lizhenhua 2025-09-08 17:02:58 +08:00
parent 7fcc44265e
commit c21e94c029
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryDetailAdd.java
View File

@ -8,9 +8,7 @@ import lombok.Data;
import lombok.ToString; import lombok.ToString;
import org.checkerframework.checker.units.qual.N; import org.checkerframework.checker.units.qual.N;
import javax.validation.constraints.Max; import javax.validation.constraints.*;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -63,7 +61,7 @@ public class ImsIntoInventoryDetailAdd implements Serializable
@ApiModelProperty(value = "单价") @ApiModelProperty(value = "单价")
@NotNull(message = "单价不能为空") @NotNull(message = "单价不能为空")
@Min(value = 0, message = "单价不能小于0") @Min(value = 0, message = "单价不能小于0")
@Max(value = 9999, message = "单价不能大于9999") @Max(value = 99900, message = "单价不能大于999")
private Long unitPrice; private Long unitPrice;
/** 总价 */ /** 总价 */
@ -77,10 +75,10 @@ public class ImsIntoInventoryDetailAdd implements Serializable
private BigDecimal deliveryNum; private BigDecimal deliveryNum;
/** 入库合格数量 */ /** 入库合格数量 */
@ApiModelProperty(value = "入库合格数量") @ApiModelProperty(value = "入库合格数量", required = true, example = "10")
@NotNull(message = "入库合格数量不能为空") @NotNull(message = "入库合格数量不能为空")
@Min(value = 0, message = "入库合格数量不能小于0") @DecimalMin(value = "0", message = "入库合格数量不能小于0")
@Max(value = 9999, message = "入库合格数量不能大于9999") @DecimalMax(value = "99900", message = "入库合格数量不能大于999")
private BigDecimal purNum; private BigDecimal purNum;
/** 不合格数量 */ /** 不合格数量 */

12
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml
View File

@ -257,12 +257,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
'系统' as data_form, '系统' as data_form,
did.expire_time, did.expire_time,
CASE CASE
WHEN did.expire_time <![CDATA[ < ]]> NOW() THEN 1 -- 已过期 WHEN did.expire_time <![CDATA[ < ]]>CURDATE() THEN 1
WHEN TIMESTAMPDIFF(DAY, NOW(), did.expire_time) <![CDATA[ <= ]]> mm.shelf_life_days THEN 3 -- 临期 WHEN TIMESTAMPDIFF(DAY, CURDATE(), did.expire_time) <![CDATA[ <= ]]> mm.shelf_life_days THEN 3
ELSE 2 -- 正常 ELSE 2
END AS expireState, END AS expireState,
TIMESTAMPDIFF( DAY, NOW(), did.expire_time ) expireDay, TIMESTAMPDIFF( DAY, NOW(), did.expire_time ) expireDay,
did.unit_id, did.unit_id,
du.unit_name, du.unit_name,
did.supplier_id, did.supplier_id,