更新

pom.xml

@@ -184,9 +184,7 @@
             <properties>
                 <env>local</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
         </profile>
         <profile>
             <id>dev</id>
@@ -204,7 +202,9 @@
             <id>prod</id>
             <properties>
                 <env>prod</env>
-            </properties>
+            </properties><activation>
+            <activeByDefault>true</activeByDefault>
+        </activation>
         </profile>
     </profiles>
     <build>

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchasePrice.java

@@ -70,6 +70,10 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      * 基准水分（%）
      */
     private Float waterBase;
+    /**
+     * 参数类型 1 扣重比 2 降幅
+     */
+    private String paramType;
     /**
      * 扣重比
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -94,6 +94,14 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 仓库名称
      */
     private String warehouseName;
+    /**
+     * 参数类型 1 扣重比 2 降幅
+     */
+    private String paramType;
+    /**
+     * 扣杂
+     */
+    private Float buckleMiscellaneous;
     /**
      * 扣重比
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1052,6 +1052,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         warehouseBaseInfo.setCount(dataCount);
                         warehouseBaseInfoList.add(warehouseBaseInfo);
                     }
+                    break;
 //                    return warehouseBaseInfoList;
                 }
             }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -122,7 +122,7 @@
         </if>
         ) b
         ORDER BY
-        b.flag,b.updateDate desc
+        b.flag desc,b.updateDate desc
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>