修改

pom.xml

@@ -184,6 +184,10 @@
             <properties>
                 <env>local</env>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
         </profile>
         <profile>
             <id>dev</id>
@@ -202,9 +206,6 @@
             <properties>
                 <env>prod</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
         </profile>
     </profiles>

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

@@ -113,6 +113,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     @TableField(exist = false)
     private Float residual;
+    /**
+     * 全部标识
+     */
+    @TableField(exist = false)
+    private String flag;
 
 
     /**

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

@@ -115,9 +115,13 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     private String storageNumber;
     /**
-     * 司称员
+     * 毛检员
      */
     private String secretaryWeigher;
+    /**
+     * 皮检员
+     */
+    private String skinInspector;
     /**
      * 质检时间
      */

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

@@ -205,9 +205,9 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String purchasePriceDel(PurchasePrice purchasePrice) {
-        this.purchasePriceDetailService.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
-        this.purchasePriceDetailPrintService.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
-        this.deleteById(purchasePrice);
+        purchasePriceDetailService.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
+        purchasePriceDetailPrintService.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
+        this.deleteById(purchasePrice.getId());
         return "ok";
     }
 
@@ -243,10 +243,10 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 else if ("二等品".equals(purchasePrice.getGrade())){
                     tidalGrainPrice=purchasePriceDetailPrint.getPrice2();
                 }
-                if ("三等品".equals(purchasePrice.getGrade())){
+                else if ("三等品".equals(purchasePrice.getGrade())){
                     tidalGrainPrice=purchasePriceDetailPrint.getPrice3();
                 }
-                if ("等外".equals(purchasePrice.getGrade())){
+                else{
                     tidalGrainPrice=purchasePriceDetailPrint.getPriceOther();
                 }
             }

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

@@ -733,6 +733,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 warehouseBaseInfo.setCount(dataCount);
             }
         }
+        else {
+            List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("comp_id", compId)
+                    .eq("warehouse_type","1")
+                    .eq("delete_flag", "0"));
+            for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList1){
+                warehouseBaseInfo.setFlag("全部");
+            }
+            warehouseBaseInfoList=warehouseBaseInfoList1;
+        }
         return warehouseBaseInfoList;
     }
 }

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

@@ -123,8 +123,6 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     @Transactional(rollbackFor = Exception.class)
     public String editTare(WeighingManagement weighingManagement) {
         WeighingManagement weighingManagement1=this.selectById(weighingManagement.getId());
-        //司称员(毛检,皮检)
-        weighingManagement.setSecretaryWeigher(weighingManagement1.getSecretaryWeigher()+','+weighingManagement.getSecretaryWeigher());
         //状态改为已称皮重
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());