src/main/resources/application-dzys.yml

@@ -216,4 +216,19 @@

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads

#榆林市工业和信息化局数据推送
api:
  ip: http://111.20.184.155:8888 #推送ip地址
  appid: 48b97e28e0aad7963e96fc50b9e63908 #企业应用id
  secret: 0db7a9fa112427df622c4207b4707432 #企业应用秘钥
  entName: 府谷县普禾煤矿有限公司 #企业名称
  socialCreditCode: 91610000598765891B #统一社会信用代码
  dayPowerConsumption: 60 #日均用电量
  outputValuesBase: 500  #单位产值基数（万元）
  electricityCost: 0.18  #月电费
  # 登录推送开关
  loginPush: false
  # 电数据推送开关
  push: false

 src/main/resources/application-jmsl.yml

@@ -216,4 +216,19 @@

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads

#榆林市工业和信息化局数据推送
api:
  ip: http://111.20.184.155:8888 #推送ip地址
  appid: 48b97e28e0aad7963e96fc50b9e63908 #企业应用id
  secret: 0db7a9fa112427df622c4207b4707432 #企业应用秘钥
  entName: 府谷县普禾煤矿有限公司 #企业名称
  socialCreditCode: 91610000598765891B #统一社会信用代码
  dayPowerConsumption: 60 #日均用电量
  outputValuesBase: 500  #单位产值基数（万元）
  electricityCost: 0.18  #月电费
  # 登录推送开关
  loginPush: false
  # 电数据推送开关
  push: false

 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml

@@ -73,6 +73,7 @@
                and t1.product_model_id = #{req.productModelId}
            </if>
        </where>
        order by t1.create_time DESC, t1.id DESC
    </select>
    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
        select
@@ -160,8 +161,7 @@
        specificationModel,
        unit
        order by
        (t3.supplier_name IS NULL) DESC,
        t3.supplier_name ASC
        max(t1.create_time) DESC
    </select>
    <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
        select

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -30,6 +30,7 @@
                and t1.create_time like  concat('%',#{req.timeStr},'%')
            </if>
        </where>
        order by t1.create_time DESC, t1.id DESC
    </select>
    <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
        select