| src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -248,10 +248,9 @@ @ApiModelProperty(value = "发货状态") private String shippingStatus = "待发货"; /** * 产品状态 * 0-未出库,1-已出库,2-待审核,3-审核完成,4-审核失败(销售台账列表展示规则见前端) */ // @TableField(exist = false) @ApiModelProperty(value = "产品状态:1-充足") @ApiModelProperty(value = "产品出库审批状态:0-未出库,1-已出库,2-待审核,3-审核完成,4-审核失败") private Integer approveStatus; @ApiModelProperty(value = "待回款总金额") src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -724,9 +724,9 @@ product.setRegisterDate(LocalDateTime.now()); // 发货信息 ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerProductId, product.getId()).orderByDesc(ShippingInfo::getCreateTime).last("limit 1")); product.setShippingCarNumber(shippingInfo.getShippingCarNumber()); product.setShippingDate(shippingInfo.getShippingDate()); if (shippingInfo != null) { product.setShippingCarNumber(shippingInfo.getShippingCarNumber()); product.setShippingDate(shippingInfo.getShippingDate()); product.setShippingStatus(shippingInfo.getStatus()); } }