合同结算方式

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -361,55 +361,10 @@ public class Contract extends BasePo {
     private Date orderDistributeTime;
 
     /**
-     * 交接单附件列表
-     */
-    @TableField(exist = false)
-    private List<ObsFile> fileList;
-
-    /**
-     * 包装附件列表
-     */
-    @TableField(exist = false)
-    private List<ObsFile> packageFileList;
-
-    /**
-     * 备注文件列表
-     */
-    @TableField(exist = false)
-    private List<ObsFile> remarkFileList;
-
-    /**
-     * 合同出货列表
-     */
-    @TableField(exist = false)
-    private List<ContractShipment> contractShipmentList;
-
-    /**
-     * 合同收费项目
-     */
-    @TableField(exist = false)
-    private List<ContractProject> contractProjectList;
-
-    /**
-     * 合同数量
-     */
-    @TableField(exist = false)
-    private Integer count;
-
-    /**
-     * 归属公司名称
-     */
-    @TableField(exist = false)
-    private String sellCorporationName;
-
-    /**
      * 报价有效期
      */
     private String effective;
 
-    @TableField(exist = false)
-    private Long upId;
-
     /**
      * 流程id
      */
@@ -564,4 +519,56 @@ public class Contract extends BasePo {
      */
     private BigDecimal terminationAmount;
 
+    /**
+     * 结算方式
+     */
+    private String settlementMethod;
+
+    //========================================================================
+    /**
+     * 交接单附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
+    /**
+     * 包装附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> packageFileList;
+
+    /**
+     * 备注文件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> remarkFileList;
+
+    /**
+     * 合同出货列表
+     */
+    @TableField(exist = false)
+    private List<ContractShipment> contractShipmentList;
+
+    /**
+     * 合同收费项目
+     */
+    @TableField(exist = false)
+    private List<ContractProject> contractProjectList;
+
+    /**
+     * 合同数量
+     */
+    @TableField(exist = false)
+    private Integer count;
+
+    /**
+     * 归属公司名称
+     */
+    @TableField(exist = false)
+    private String sellCorporationName;
+
+
+    @TableField(exist = false)
+    private Long upId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -83,7 +83,6 @@ import com.fjhx.tenant.utils.DictUtils;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
-import com.fjhx.wms.mapper.stock.StockWaitDetailsMapper;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.annotation.TenantIgnore;
@@ -214,8 +213,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
-    private StockWaitDetailsMapper stockWaitDetailsMapper;
-    @Autowired
     private ProductClassifyService productClassifyService;
 
     @Autowired
@@ -310,17 +307,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public Page<ContractVo> getPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getWrapper();
         setContractParam(dto, wrapper);
-//		SysUser sysUser = UserUtil.getUserInfo();
-//		if (StringUtils.isEmpty(sysUser.getUserCode())) {//不是业务员看所有
         return pageCommon(dto, wrapper);
-//		} else {//是业务员
-//			List<Long> authIdList = customerService.getAuthIdList();
-//			if (authIdList.size() == 0) {
-//				return new Page<>();
-//			}
-//			wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
-//			return pageCommon(dto, wrapper);
-//		}
     }
 
     /**