yys 1.发货台账修改

maven

2025-11-19 c27858b16969db1ff313b73f017187e06bf5aa9c

yys
1.发货台账修改

 src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java

@@ -24,12 +24,25 @@
    @ApiModelProperty(value = "销售台账id")
    private Long salesLedgerId;

    @ApiModelProperty(value = "销售产品id")
    private Long salesLedgerProductId;

    @TableField(exist = false)
    @ApiModelProperty(value = "销售合同号")
    @Excel(name = "销售合同号")
    private String salesContractNo;

    @TableField(exist = false)
    @ApiModelProperty(value = "产品大类")
    @Excel(name = "产品大类")
    private String productCategory;

    @TableField(exist = false)
    @ApiModelProperty(value = "规格型号")
    @Excel(name = "规格型号")
    private String specificationModel;

    @TableField(exist = false)
    @ApiModelProperty(value = "客户名称")
    @Excel(name = "客户名称")
    private String customerName;

 src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 7003
  port: 8080
  servlet:
    # 应用的访问路径
    context-path: /
@@ -62,7 +62,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://localhost:3306/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
      # 从库数据源
@@ -134,7 +134,7 @@
  # redis 配置
  redis:
    # 地址
    host: 127.0.0.1
    host: 192.168.1.185
#    host: 172.17.0.1
    # 端口，默认为6379
    port: 6379

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
# Spring配置
spring:
  profiles:
    active: demo
    active: dev

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -14,13 +14,19 @@
        s.update_user,
        s.tenant_id,
        sl.sales_contract_no,
        sl.customer_name
        sl.customer_name,
        slp.product_category,
        slp.specification_model
        FROM shipping_info s
        LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
        left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
        WHERE 1=1
        <if test="req.salesContractNo != null and req.salesContractNo != ''">
            AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
        </if>
          <if test="req.productCategory != null and req.productCategory != ''">
            AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
        </if>
        <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
            AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
        </if>