加字段

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -90,6 +90,7 @@ public enum StatusEnum {
     // 采购平仓统计
     PUR_COLLECT("4", "部分收款", ""),
     PUR_COLLECTaLL("6", "全部收款", ""),
+    TO_BE_RECEIVED("8", "待收款", ""),
 
     // 点价确认单附件状态
     Not_UPLOADED("0", "未上传", ""),

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

@@ -78,6 +78,10 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 结算方式
      */
     private String settlementMethod;
+    /**
+     * 结算重量方式(1出库重量结算2入库重量结算)
+     */
+    private String settlementWeightMethod;
     /**
      * 买方
      */
@@ -353,6 +357,8 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
     private List<ContractManagementInfo> contractManagementInfoList;
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
+    @TableField(exist = false)
+    private List<TranTaskInfo> tranTaskInfoList;
     /**
      * 报表状态
      */

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

@@ -45,6 +45,34 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 运输阶段编号
+     */
+    private String processNo;
+    /**
+     * 派车编号
+     */
+    private String tranCarNo;
+    /**
+     * 箱号
+     */
+    private String caseNo;
+    /**
+     * 封号
+     */
+    private String titleNo;
+    /**
+     * 仓位号
+     */
+    private String binNumber;
+    /**
+     * 车厢号
+     */
+    private String boxNo;
+    /**
+     * 反馈人
+     */
+    private String feedbackPerson;
     /**
      * 车牌号
      */