|
|
@@ -8,6 +8,7 @@ import com.malk.server.aliwork.YDConf;
|
|
|
import com.malk.server.aliwork.YDParam;
|
|
|
import com.malk.service.aliwork.YDClient;
|
|
|
import com.malk.service.aliwork.YDService;
|
|
|
+import com.malk.utils.PublicUtil;
|
|
|
import com.malk.utils.UtilMap;
|
|
|
import com.malk.utils.UtilMc;
|
|
|
import com.malk.utils.UtilNumber;
|
|
|
@@ -268,6 +269,7 @@ public class KKLImplService implements KKLService {
|
|
|
List<String> rates = (List<String>) JSON.parse(String.valueOf(data.get("rate")));
|
|
|
List<String> rates2 = (List<String>) JSON.parse(String.valueOf(data.get("rate2")));
|
|
|
List<String> status = (List<String>) JSON.parse(String.valueOf(data.get("status")));
|
|
|
+ String oldSupId=String.valueOf(data.get("oldSupId"));
|
|
|
|
|
|
for (int i = 0; i < types.size(); i++) {
|
|
|
|
|
|
@@ -292,7 +294,9 @@ public class KKLImplService implements KKLService {
|
|
|
YDConf.FORM_OPERATION operation = YDConf.FORM_OPERATION.create;
|
|
|
// ppExt: 提交校验逻辑, 匹配定价单数若存在则匹配服务费率, 不一致执行更新
|
|
|
if (records.size() > 0) {
|
|
|
- Optional optional = records.stream().filter(item -> item.get("textField_llkb7kd2").equals(material.get("textField_llkb7kd2"))).findAny();
|
|
|
+ Optional optional = records.stream().filter(item -> item.get("textField_llkb7kd2").equals(material.get("textField_llkb7kd2")) && // 物品编号
|
|
|
+ item.get("textField_llm1vtjm").equals(material.get("textField_llm1vtjm"))// 项目编号)
|
|
|
+ ).findAny();
|
|
|
if (optional.isPresent()) {
|
|
|
ydParam.setUpdateFormDataJson(JSON.toJSONString(material));
|
|
|
ydParam.setFormInstanceId(String.valueOf(((Map) optional.get()).get("formInstanceId")));
|
|
|
@@ -336,6 +340,8 @@ public class KKLImplService implements KKLService {
|
|
|
double cost1 = UtilMap.getDouble(data, "costPrice");
|
|
|
double cost2 = UtilMap.getDouble(data, "nextCostPrice");
|
|
|
String cost3 = UtilMap.getString(data,"timeLimit");
|
|
|
+ String cost4 = UtilMap.getString(data,"packNumber");// 包装数量
|
|
|
+ String cost5 = UtilMap.getString(data,"packUnit");// 包装单位
|
|
|
|
|
|
//todo2: 服务执行, 周日凌晨更新价格前, 是否重新匹配数据?
|
|
|
List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
|
|
|
@@ -354,7 +360,7 @@ public class KKLImplService implements KKLService {
|
|
|
double price2 = UtilNumber.formatPrecisionValue(cost2 * (100 + rate2) / 100f);
|
|
|
|
|
|
Map update = UtilMap.map("numberField_llkknd6h, numberField_lpalgz0a", price1, price2);
|
|
|
- update.putAll(UtilMap.map("numberField_llkknd6g, numberField_lpalgz05, dateField_lm4lxur7", cost1, cost2, cost3 ));
|
|
|
+ update.putAll(UtilMap.map("numberField_llkknd6g, numberField_lpalgz05, dateField_lm4lxur7, numberField_lnrzzg03, textField_lnrzzg04", cost1, cost2, cost3, cost4, cost5 ));
|
|
|
ydClient.operateData(YDParam.builder()
|
|
|
.formInstanceId(String.valueOf(record.get("formInstanceId")))
|
|
|
.updateFormDataJson(JSON.toJSONString(update))
|
lfx