zxz před 3 roky
rodič
revize
ab43397ee1

+ 28 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractExpensesInfo.java

@@ -73,8 +73,34 @@ public class ContractExpensesInfo extends BaseModel<ContractExpensesInfo> {
      * 支付日期
      */
     private Date payDeadline;
-
-
+    /**
+     * 支出粮款(元)
+     */
+    private Double foodExpenditure;
+    /**
+     * 收入粮款(元)
+     */
+    private Double grainIncome;
+    /**
+     * 费用收入(元)
+     */
+    private Double expenseIncome;
+    /**
+     * 费用支出(元)
+     */
+    private Double expensesPay;
+    /**
+     * 当期利润(元)
+     */
+    private Double currentProfit;
+    /**
+     * 费用表ID
+     */
+    private String expensesId;
+    /**
+     * 费用类型(1合同费用3库点费用)
+     */
+    private String costType;
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 16 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractInventoryDistribution.java

@@ -79,8 +79,22 @@ public class ContractInventoryDistribution extends BaseModel<ContractInventoryDi
      * 成本
      */
     private Double cost;
-
-
+    /**
+     * 所在仓库
+     */
+    private String locusWarehouse;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 库存类型(1合同库存3收购库存)
+     */
+    private String inventoryType;
+    /**
+     * 重量(吨)
+     */
+    private Float weight;
     @Override
     protected Serializable pkVal() {
         return this.id;