优化

hx-common/service-flow/src/main/java/com/fjhx/controller/example/ExampleInfoController.java

@@ -1,6 +1,7 @@
 package com.fjhx.controller.example;
 
 import com.fjhx.service.example.ExampleInfoService;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,5 +21,12 @@ public class ExampleInfoController {
     @Autowired
     private ExampleInfoService exampleInfoService;
 
+//    @Autowired
+//    public R serviceNameList() {
+//
+//        return R.data();
+//    }
+
+
 }
 

hx-common/service-flow/src/main/java/com/fjhx/controller/process/ProcessNodeController.java

@@ -49,7 +49,7 @@ public class ProcessNodeController {
     }
 
     /**
-     * 创建节点
+     * 删除节点
      */
     @PostMapping("/delete")
     public R delete(@RequestBody ProcessNode processNode) {

hx-common/service-flow/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 # 服务器端口
 server:
-  port: 8201
+  port: 8003
 logging:
   level:
     org.springframework.data.mongodb.core: DEBUG

hx-common/service-flow/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 # 服务器端口
 server:
-  port: 8201
+  port: 8003
 
 # 数据源配置
 spring:

hx-common/service-flow/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 # 服务器端口
 server:
-  port: 8201
+  port: 8003
 
 # 数据源配置
 spring:

hx-service-api/service-flow-api/src/main/java/com/fjhx/enums/ButtonNameEnum.java

@@ -21,6 +21,8 @@ public enum ButtonNameEnum {
     COMPLETE(6, "完成"),
     // 执行分支逻辑
     BRANCH(7, "分支"),
+    // 流程进行中
+    HAVE_IN_HAND(98, "进行中"),
     // 结束流程
     END(99, "结束");
 

hx-service/storage/src/main/java/com/fjhx/applet/service/impl/MaterialReceiveServiceImpl.java

@@ -46,7 +46,6 @@ public class MaterialReceiveServiceImpl extends ServiceImpl<MaterialReceiveMappe
                 String uuid = UUID.randomUUID().toString();
 
 
-
             }
 
 
@@ -76,11 +75,11 @@ public class MaterialReceiveServiceImpl extends ServiceImpl<MaterialReceiveMappe
                     Integer num = baseMapper.countNum(account);
                     WxAppletUtil.UniformSendEntity uniformSendEntity = new WxAppletUtil.UniformSendEntity();
                     uniformSendEntity.setTouser(openId);
-                    uniformSendEntity.setTemplate_id("Tt0C6SOrtd2QXIdLqrm0CNdarUE4LG_lNJblUnkqTPM");
+                    uniformSendEntity.setTemplate_id("YQNpUJwn7kdApbkO142eIeBq4qiYRfmNlVhSg_5ZdYg");
                     uniformSendEntity.setPage("pages/user/login");
-                    uniformSendEntity.addData("thing1", "智能仓储");
-                    uniformSendEntity.addData("thing2", "您有" + num + "条待接收物料");
-                    uniformSendEntity.addData("time3", DateUtil.format(new Date(), "yyyy年MM月dd日 HH:mm"));
+                    uniformSendEntity.addData("thing3", "智能仓储");
+                    uniformSendEntity.addData("thing2", num.toString());
+                    uniformSendEntity.addData("thing6", DateUtil.format(new Date(), "yyyy年MM月dd日 HH:mm"));
                     WxAppletUtil.sendMessage(uniformSendEntity);
                 }
             }