成本分配增加多发少发字段，计划单统计处理面损状态

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocation.java

@@ -190,9 +190,6 @@ public class SyCostAllocation implements Serializable {
     @ExcelCollection(name="汇率")
     @ApiModelProperty(value = "汇率")
     private BigDecimal exchangeRate;
-    @TableField(exist = false)
-    @ExcelCollection(name="税率")
-    @ApiModelProperty(value = "税率")
-    private BigDecimal iTaxRate;
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocationFabric.java

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -111,6 +112,11 @@ public class SyCostAllocationFabric implements Serializable {
     @ApiModelProperty(value = "加工单位")
     private String processUnit;
 
+    /**多发少发*/
+    @Excel(name = "多发少发", width = 15)
+    @ApiModelProperty(value = "多发少发")
+    private BigDecimal pilosityFewer;
+
     //备注
     private String remarks;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -276,6 +276,9 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
                 Fabric.setSyTransfers(transferlist);
                 Fabric.setTransferCost(cost);
             }
+
+            //多发少发 = 购入数量-计划数量
+            Fabric.setPilosityFewer(Fabric.getPurchaseQuantity().subtract(Fabric.getPlanQuantity()));
         }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -310,11 +310,12 @@
     <select id="queryCodeByfstatus" resultType="String">
         select plan_code as cCode
         from sy_fabric_loss_report
+        where 1=1
         <if test='status !="" and status != null'>
-            where status=#{status}
+            and status=#{status}
         </if>
         <if test='ffirstApproveDate !=""'>
-            where first_approve_date like concat(#{ffirstApproveDate},'%')
+            and first_approve_date like concat(#{ffirstApproveDate},'%')
         </if>
 
     </select>