调整

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/controller/KKLController.java

@@ -2,7 +2,10 @@ package com.malk.kuaikeli.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.malk.kuaikeli.service.KKLService;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
 import com.malk.server.common.McR;
+import com.malk.utils.UtilMap;
 import com.malk.utils.UtilServlet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +52,10 @@ public class KKLController {
 
         log.info("validate, {}", JSON.toJSONString(data));
 
-        kklService.validateApprove(data);
+        boolean approve=kklService.validateApprove(data);
+        if(approve){
+            kklService.updateState(UtilMap.getString(data,"poid"));
+        }
         return McR.success();
     }
 

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/controller/SupplierMaterialController.java

@@ -37,6 +37,7 @@ public class SupplierMaterialController {
             return McR.errorParam("文件格式错误！");
         }
         supplierMaterialService.uploadData(file);
+        supplierMaterialService.sync();// 异步执行
         return McR.success();
     }
 

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/service/KKLService.java

@@ -8,7 +8,10 @@ public interface KKLService {
 
     void matchSupplier(Map data);
 
-    void validateApprove(Map data);
+    boolean validateApprove(Map data);
+
+    @Async
+    void updateState(String id);
 
     @Async
     void serviceRate(Map data);

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/service/impl/KKLImplService.java

@@ -1,6 +1,8 @@
 package com.malk.kuaikeli.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.malk.kuaikeli.service.KKLService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
@@ -15,10 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -65,7 +64,7 @@ public class KKLImplService implements KKLService {
      * 后端校验返回、加任何产品都要走审批，减少20%以内直接过，每一个原材料
      */
     @Override
-    public void validateApprove(Map data) {
+    public boolean validateApprove(Map data) {
 
         boolean approve = false;
         List<Map> dataList = UtilMap.getList(data, "list");
@@ -98,12 +97,105 @@ public class KKLImplService implements KKLService {
                     .formDataJson(JSON.toJSONString(data.get("form"))) // 前端数据组装
                     .userId(data.get("user").toString())
                     .build(), YDConf.FORM_OPERATION.start);
+        }
+        // 执行业务逻辑-编辑前后更新计划采购单
+        planUpdate(UtilMap.getString(data,"poid"),dataList);
+        return approve;
+    }
 
-            // 更新计划状态
-            ydService.operateData(YDParam.builder()
-                    .formInstanceId(data.get("poid").toString())
-                    .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lm8znr9n", "执行中")))
-                    .build(), YDConf.FORM_OPERATION.update);
+    @Override
+    public void updateState(String id) {
+        try {
+            log.info("异步修改状态，休眠3s");
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        // 更新计划状态
+        ydService.operateData(YDParam.builder()
+                .formInstanceId(id)
+                .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lm8znr9n", "执行中")))
+                .build(), YDConf.FORM_OPERATION.update);
+    }
+
+    private void planUpdate(String poid,List<Map> dataList){
+        String formUuid="FORM-XHA66881J8KDA6V3FM6LZBUP9PDE37VESDNLL6";
+        Map formData=(Map) ydClient.queryData(YDParam.builder().formInstId(poid).build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
+        List<Map> list=UtilMap.getList(formData,"tableField_lln477nw");
+        saveData(list,formData,formUuid,false);// -
+        saveData(dataList,formData,formUuid,true);// +
+    }
+
+    private void saveData(List<Map> list,Map formData,String formUuid,boolean isAdd){
+        for(Map map:list){
+            Map queryMap=new HashMap();
+            queryMap.put("dateField_llndtdwl", Arrays.asList(map.get("dateField_ln1ez5lg"),map.get("dateField_ln1ez5lg")));// 日期
+            queryMap.put("textField_llq9x6ov",formData.get("textField_lln477nh"));// 项目编号
+            queryMap.put("textField_lmk97m1v",map.get("textField_lmk97m1v"));// 原材料编号
+            Map upMap=new HashMap();
+            upMap.put("numberField_llojyfy3",map.get("numberField_lmsvfftq"));// 成本单价
+            upMap.put("numberField_llojyfy4",map.get("numberField_lmsvfftr"));// 服务费率
+            upMap.put("dateField_llndtdwl",map.get("dateField_ln1ez5lg"));// 计划日期
+            upMap.put("textField_llndm599",map.get("textField_llndm599"));// 原材料名称
+            upMap.put("textField_lluj4hu1",map.get("textField_lln3lmn2"));// 单位
+            upMap.put("textField_llq9x6ov",formData.get("textField_lln477nh"));// 项目编号
+            upMap.put("textField_lm5z7kvo",map.get("textField_ln1ez5li"));// 计划日期（文本）
+            upMap.put("textField_lm5z4ioi",formData.get("textField_lmsvfftp"));// 项目名称
+            upMap.put("textField_lmk97m1v",map.get("textField_lmk97m1v"));// 原材料编号
+            upMap.put("selectField_lmqclyx9",map.get("selectField_lmqclyx9"));// 第一分类
+            upMap.put("numberField_lmqclyxa",map.get("numberField_lmqclyxa"));// 供货价
+            upMap.put("textField_lnsmha2j",map.get("textField_lnwxz9ji"));// 品牌
+            upMap.put("textField_lpjet322",formData.get("textField_lpjet322"));// 档口名称
+            upMap.put("textField_lpjet321",formData.get("textField_lpjet321"));// 档口编号
+            upMap.put("textField_loe04txb",map.get("textField_lptgvips"));// 采购单位
+            List<Map> list2=(List<Map>) ydClient.queryData(YDParam.builder().formUuid(formUuid).searchFieldJson(JSONObject.toJSONString(queryMap)).build(), YDConf.FORM_QUERY.retrieve_list).getData();
+            if(list2==null||list2.size()<1){
+                if(!isAdd){
+                    log.info("未找到对应的计划采购单,退出");
+                    continue;
+                }
+                upMap.put("numberField_lln477o2", map.get("numberField_lmym5628"));// 初始采购数量（kg）
+                upMap.put("numberField_lm9008fq", map.get("numberField_lmym5628"));// 实际采购数量（kg）
+                upMap.put("numberField_lns0dkzv", map.get("numberField_lns0dkzv"));// 投料数量（kg）
+                upMap.put("numberField_loe04txa", map.get("numberField_lomyf89l"));// 采购量
+                ydClient.operateData(YDParam.builder().formUuid(formUuid).formDataJson(JSONObject.toJSONString(upMap)).build(), YDConf.FORM_OPERATION.create);
+            }else{
+                Map oldMap=UtilMap.getMap(list2.get(0),"formData");
+                if(isAdd){
+                    upMap.put("numberField_lln477o2", NumberUtil.add(UtilMap.getString(oldMap,"numberField_lln477o2"),UtilMap.getString(map,"numberField_lmym5628")));// 初始采购数量（kg）
+                    upMap.put("numberField_lm9008fq", NumberUtil.add(UtilMap.getString(oldMap,("numberField_lm9008fq")),UtilMap.getString(map,("numberField_lmym5628"))));// 实际采购数量（kg）
+                    upMap.put("numberField_lns0dkzv", NumberUtil.add(UtilMap.getString(oldMap,("numberField_lns0dkzv")),UtilMap.getString(map,("numberField_lns0dkzv"))));// 投料数量
+                    upMap.put("numberField_loe04txa",NumberUtil.add(UtilMap.getString(oldMap,"numberField_loe04txa"),UtilMap.getString(map,"numberField_lomyf89l")));// 采购量
+                }else {
+                    upMap.put("numberField_lln477o2", NumberUtil.sub(UtilMap.getString(oldMap, "numberField_lln477o2"), UtilMap.getString(map, "numberField_lmym5628")));// 初始采购数量（kg）
+                    upMap.put("numberField_lm9008fq", NumberUtil.sub(UtilMap.getString(oldMap, ("numberField_lm9008fq")), UtilMap.getString(map, ("numberField_lmym5628"))));// 实际采购数量（kg）
+                    upMap.put("numberField_lns0dkzv", NumberUtil.sub(UtilMap.getString(oldMap, ("numberField_lns0dkzv")), UtilMap.getString(map, ("numberField_lns0dkzv"))));// 投料数量
+                    upMap.put("numberField_loe04txa",NumberUtil.sub(UtilMap.getString(oldMap,"numberField_loe04txa"),UtilMap.getString(map,"numberField_lomyf89l")));// 采购量
+                }
+                ydClient.operateData(YDParam.builder().formInstanceId(UtilMap.getString(list2.get(0),"formInstanceId")).updateFormDataJson(JSONObject.toJSONString(upMap)).build(), YDConf.FORM_OPERATION.update);
+            }
+            if(isAdd){
+                // 保存切配工作单
+                String formUuid2="FORM-RK966E71T0LDSTW39WFHE9OQ5GU23FKRRDNLL2";
+                Map qMap=new HashMap();
+                qMap.put("textField_lmsuq8am",formData.get("textField_lln477nh"));// 项目编号
+                qMap.put("dateField_llndtdwl",Arrays.asList(map.get("dateField_ln1ez5lg"),map.get("dateField_ln1ez5lg")));// 日期
+                qMap.put("textField_lm8zta2z",formData.get("selectField_llm1i9yl"));// 餐次
+                qMap.put("selectField_lln3lmn5",map.get("textField_lm4m83rv"));// 切配类型
+                qMap.put("textField_llndm599",map.get("textField_llndm599"));// 原材料名称
+                Map addMap=new HashMap();
+                addMap.putAll(qMap);
+                addMap.put("associationFormField_llndtdwg",formData.get("associationFormField_lln477nb"));// 项目点
+                addMap.put("numberField_lln477o2",map.get("numberField_lmym5628"));// 数量(kg)
+                addMap.put("numberField_lnrkgimz",map.get("numberField_lomyf89l"));// 初始采购数量
+                addMap.put("textField_ln1ez5li",map.get("textField_ln1ez5li"));// 计划日期（文本）
+                addMap.put("dateField_llndtdwl",map.get("dateField_ln1ez5lg"));// 日期
+                ydClient.operateData(YDParam.builder().formUuid(formUuid2)
+                        .searchCondition(JSONObject.toJSONString(qMap))
+                        .formDataJson(JSONObject.toJSONString(addMap))
+                        .build(), YDConf.FORM_OPERATION.upsert);
+
+            }
         }
     }
 

mjava-kuaikeli/src/main/java/com/malk/kuaikeli/service/impl/SupplierMaterialServiceImpl.java

@@ -28,6 +28,7 @@ import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -65,6 +66,7 @@ public class SupplierMaterialServiceImpl extends ServiceImpl<SupplierMaterialMap
     public void uploadData(MultipartFile file) {
         try {
             EasyExcel.read(file.getInputStream(), SupplierMaterial.class, new SupplierMaterialDataListener(baseMapper)).sheet().doRead();
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -76,6 +78,7 @@ public class SupplierMaterialServiceImpl extends ServiceImpl<SupplierMaterialMap
      * 2.查询定价单组装数据保存到定价明细中间表
      */
     @Override
+    @Async
     public void sync() {
         QueryWrapper<SupplierMaterial> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SupplierMaterial::getIsNeedSyncYd,"是");
@@ -282,5 +285,8 @@ public class SupplierMaterialServiceImpl extends ServiceImpl<SupplierMaterialMap
         return NumberUtil.roundStr(NumberUtil.div(NumberUtil.mul(unitPrice,NumberUtil.add(rate,"100").toString()).toString(),"100").toString(),2);
     }
 
+    public static void main(String[] args) {
+        System.out.println(NumberUtil.sub(5,1));
+    }
 
 }

mjava-kuaikeli/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9021
+  port: 9020
   servlet:
     context-path: /api/kuaikeli
 spring:
@@ -12,9 +12,9 @@ enable:
   scheduling: false
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/connect/canrui/log/
+  path: /home/server/kuaikeli/log/
   level:
-    com.zitoo.connect.*: debug
+    com.malk.*: debug
 
 # dingtalk
 dingtalk:

mjava-kuaikeli/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 100MB

mjava-kuaikeli/src/main/resources/static/web/css/chunk-1a891981.86df4f93.css

@@ -0,0 +1 @@
+.comp[data-v-46a2638c] .el-drawer{overflow-y:auto}.comp .comp-form-oper[data-v-46a2638c]{margin-top:.4rem;text-align:center}.comp .comp-form-oper .el-button[data-v-46a2638c]{margin:0 .15rem}.van-cell[data-v-46a2638c]{overflow:hidden;border-radius:.04rem}.van-button[data-v-46a2638c]{overflow:hidden;border-radius:.08rem}

mjava-kuaikeli/src/main/resources/static/web/css/chunk-1bf96e69.8bd88a30.css

@@ -0,0 +1 @@
+[data-v-d46765f6]:export{colorTheme:#3170f5}.main[data-v-d46765f6]{padding:.3rem .2rem}.scan[data-v-d46765f6]{padding-top:.2rem;background-color:#fff;padding:.3rem .2rem;position:relative;text-align:center}.scan h2[data-v-d46765f6]{font-size:.18rem;line-height:3;padding-bottom:.2rem}

mjava-kuaikeli/src/main/resources/static/web/css/chunk-2628d9a4.9c878275.css

@@ -0,0 +1 @@
+[data-v-43a425a6]:export{colorTheme:#3170f5}.main[data-v-43a425a6]{text-align:center;background-color:#fff;height:100%}.guide[data-v-43a425a6]{width:100%}.guide img[data-v-43a425a6]{width:.5rem;height:.5rem;margin:auto;margin-top:7%}h2[data-v-43a425a6]{padding-top:.4rem;font-size:.24rem;text-align:justify-all}button[data-v-43a425a6]{margin-top:7%}

mjava-kuaikeli/src/main/resources/static/web/css/chunk-2e5c0360.eccac5fa.css

@@ -0,0 +1 @@
+[data-v-13871c15]:export{colorTheme:#3170f5}.nav-title[data-v-13871c15]{max-width:60%;margin:0 auto;color:#323233;font-weight:500;font-size:.16rem}.nav-title-white[data-v-13871c15]{color:#fff}*{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}input,textarea{-webkit-user-select:auto;margin:0;padding:0;outline:none}

mjava-kuaikeli/src/main/resources/static/web/css/chunk-7e06598d.c94e184e.css

@@ -0,0 +1 @@
+[data-v-5c7cd7f8]:export{colorTheme:#3170f5}.comp-table[data-v-5c7cd7f8]{overflow:scroll}.comp-pagination[data-v-5c7cd7f8]{padding:.3rem 0 .1rem 0}.tableStyle{background-color:#fafafa!important;font-weight:700}.paginationStyle{text-align:center}

mjava-kuaikeli/src/main/resources/static/web/css/chunk-b443f318.cc854d2e.css

@@ -0,0 +1 @@
+[data-v-63e1cb12]:export{colorTheme:#3170f5}.main .loginout[data-v-63e1cb12]{position:absolute;width:calc(100% - .6rem);left:.3rem;bottom:20%}

mjava-kuaikeli/src/main/resources/static/web/js/chunk-vendors.1634155197efea3c3a4a.0.1.0.js.LICENSE.txt

@@ -0,0 +1,14 @@
+/**
+ * Checks if an event is supported in the current execution environment.
+ *
+ * NOTE: This will not work correctly for non-generic events such as `change`,
+ * `reset`, `load`, `error`, and `select`.
+ *
+ * Borrows from Modernizr.
+ *
+ * @param {string} eventNameSuffix Event name, e.g. "click".
+ * @param {?boolean} capture Check if the capture phase is supported.
+ * @return {boolean} True if the event is supported.
+ * @internal
+ * @license Modernizr 3.0.0pre (Custom Build) | MIT
+ */

mjava-kuaikeli/src/main/resources/static/web/js/npm.quasar.7213c7c65a94c11e9a38.0.1.0.js.LICENSE.txt

@@ -0,0 +1,5 @@
+/*!
+ * Quasar Framework v1.18.5
+ * (c) 2015-present Razvan Stoenescu
+ * Released under the MIT License.
+ */