wukq-20210506-地磅接口迭代版本一（初版-需测试）

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java

@@ -288,12 +288,13 @@ public class ContractDao {
 			UUID dinasTypeId2 = detail.get("dinasType").getUuid(BaseConstants.ID);
 			if(dinasTypeId2.equals(dinasTypeId)) {
 				dinasAmount =  new BigDecimal(detail.getDouble(ContractConstant.DINAS_AMOUNT));	
-				saleDinasAmount =  new BigDecimal(detail.getDouble(ContractConstant.SALE_DINAS_AMOUNT));
-				advanceBalance =  new BigDecimal(detail.getDouble(ContractConstant.ADVANCE_BALANCE));
+				saleDinasAmount =  new BigDecimal(contract.getDouble(ContractConstant.SALE_DINAS_AMOUNT));
+				advanceBalance =  new BigDecimal(contract.getDouble(ContractConstant.ADVANCE_BALANCE));
 				detail.set(ContractConstant.DINAS_AMOUNT, dinasAmount.add(DEALAMOUNT));
-				update(detail);
+				update(detail);	
 				contract.set(ContractConstant.ADVANCE_BALANCE, advanceBalance.add(AMOUNT));
 				contract.set(ContractConstant.SALE_DINAS_AMOUNT, saleDinasAmount.subtract(DEALAMOUNT));
+				update(contract);	
 				flag = true;
 				break;
 			}

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/PayMentSourceEnum.java

+package com.xyst.dinas.sales.constant;
+
+public enum PayMentSourceEnum {
+	/**
+	 * 现金
+	 */
+	Cash("Cash", "Cash"),
+	
+	/**
+	 * 预付款
+	 */
+	Advance("Advance", "Advance");
+	
+	private String value = "";
+	private String description = "";
+	
+	PayMentSourceEnum(String value, String description){
+		this.value = value;
+		this.description = description;
+	}
+	
+	PayMentSourceEnum(){
+		this("", "");
+	}
+	
+	public String getValue(){
+		return this.value;
+	}
+	
+	public String getDescription(){
+		return this.description;
+	}
+}

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java

 package com.xyst.dinas.sales.dao;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -8,8 +9,11 @@ import org.hibernate.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 import org.springframework.orm.hibernate5.HibernateTemplate;
+import org.springframework.test.web.reactive.server.KotlinBodySpec;
 
 import com.beecode.bcp.type.KObject;
+import com.beecode.inz.common.BaseConstants;
+import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.sales.constant.SalesPlanConstant;
 import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
 
@@ -156,4 +160,27 @@ public class SalesPlanDao {
 			
 		});
 	}
+	
+	
+	public boolean updateSalesPlanAmount(KObject salesPlanDao,UUID dinasTypeId,UUID contract,UUID project,UUID purchaseSandUnit,BigDecimal DEALAMOUNT) {
+		List<KObject> SalesPlanList = salesPlanDao.get("SalesPlanDetails").toList();
+		BigDecimal actualSaleAmount;
+		boolean flag = false;
+		for (KObject detail : SalesPlanList) {//合同中的砂石明细
+			UUID contract2 = detail.get("contract").getUuid(BaseConstants.ID);
+			UUID project2 = detail.get("project").getUuid(BaseConstants.ID);
+			UUID purchaseSandUnit2 = detail.get("purchaseSandUnit").getUuid(BaseConstants.ID);
+			UUID dinasType2 = detail.get("dinasType").getUuid(BaseConstants.ID);
+			//UUID station2 = detail.get("station").getUuid(BaseConstants.ID);
+			if(dinasType2.equals(dinasTypeId) && contract2.equals(contract) && project2.equals(project)&&purchaseSandUnit2.equals(purchaseSandUnit)) {
+				actualSaleAmount =  new BigDecimal(detail.getDouble(SalesPlanConstant.actualSaleAmount));	
+				detail.set(SalesPlanConstant.actualSaleAmount,actualSaleAmount.subtract(DEALAMOUNT));
+				update(detail);	
+				flag = true;
+				break;
+			}
+		}
+		return false;
+		
+	}
 }