矿山域-流程管理

business-modules-web/business-transport-start/pom.xml

@@ -116,6 +116,28 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <!-- 开发环境 -->
+        <profile>
+            <id>dev</id>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+            <!-- 设置为默认环境 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+
+        <!-- 生产环境 -->
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
@@ -132,6 +154,23 @@
                     <mainClass>com.sckw.transport.TransportStartApplication</mainClass>
                 </configuration>
             </plugin>
+            <!-- maven 打包插件 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.20</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

business-modules-web/business-transport-start/src/main/resources/application-prod.yml

@@ -0,0 +1,79 @@
+server:
+  port: 10086
+  application:
+    name: prod
+
+spring:
+  datasource:
+    dynamic:
+      primary: master
+      strict: false
+      datasource:
+        master:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_order?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        truck:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_truck?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        address:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_address?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        driver:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_driver?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        path:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_path?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        goods:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_goods?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        company:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_company?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        user:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        mine:
+          url: jdbc:mysql://rm-2vcw922e20158115l.mysql.cn-chengdu.rds.aliyuncs.com:3306/business_mine?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: sckw_business_system
+          password: H2RTSYDc@xjzSWaLA
+          driver-class-name: com.mysql.cj.jdbc.Driver
+  data:
+    redis:
+      host: r-2vcqhixqvh8gwzj3by.redis.cn-chengdu.rds.aliyuncs.com
+      password: mCFEETDwBhgB29y2
+      port: 6379
+      database: 24
+      timeout: 10000
+#
+#mybatis-plus:
+#  mapper-locations: classpath*:/mapper/*.xml    #扫描xml文件
+#  #实体扫描，多个package用逗号或者分号分隔
+#  typeAliasesPackage: com.sckw.*.entity
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+#
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/*.xml
+  typeAliasesPackage: com.sckw.*.entity
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+

business-modules-web/business-transport-start/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   port: 10086
   application:
-    name: test
+    name: dev
 
 spring:
   datasource:

business-modules/business-mine/src/main/java/com/sckw/mine/common/OrderServerCommon.java

@@ -1,5 +1,6 @@
 package com.sckw.mine.common;
 
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.TenantUtil;
 import com.sckw.mine.entity.KwBusinessActionTrack;
@@ -27,7 +28,7 @@ public class OrderServerCommon {
     private GenOrderCode genOrderCode;
 
 
-    public void saveActionTrack(Long mineOrderId, String status, String remark, String prefix) {
+    public void saveActionTrack(Long mineOrderId, String status, String remark, String prefix, Boolean isAction) {
         KwBusinessActionTrack kwBusinessActionTrack = new KwBusinessActionTrack();
         kwBusinessActionTrack.setId(new IdWorker(1L).nextId());
         kwBusinessActionTrack.setTenantId(TenantUtil.getTenant());
@@ -36,13 +37,16 @@ public class OrderServerCommon {
         kwBusinessActionTrack.setStatus(status);
         kwBusinessActionTrack.setTaskOrderNum(generatorNum("T", 14));
         kwBusinessActionTrack.setRemark(remark);
+        if("8".equals(status) || isAction) {
+            kwBusinessActionTrack.setIsAction(Global.NUMERICAL_ONE);
+        }
         kwBusinessActionTrackMapper.insert(kwBusinessActionTrack);
     }
 
     public String generatorNum(String prefix, Integer length)
     {
         LocalDate currentDate = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMdd");
         String orderPrefix = currentDate.format(formatter);
         String key = prefix + orderPrefix;
         return genOrderCode.genOrderCode(length, key, key);

business-modules/business-mine/src/main/java/com/sckw/mine/controller/MineralAggregateController.java

@@ -83,6 +83,16 @@ public class MineralAggregateController {
         return mineralAggregateService.statusAction(statusActionReq);
     }
 
+    /**
+     * 查询 分页查询
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @GetMapping("/findList")
+    public HttpResult findList(@RequestParam(value = "name", required = false) String name) {
+        return mineralAggregateService.findList(name);
+    }
+
 
 
 

business-modules/business-mine/src/main/java/com/sckw/mine/controller/WorkFlowController.java

@@ -85,6 +85,15 @@ public class WorkFlowController {
     }
 
 
+    /**
+     * 查询 list查询
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @GetMapping("/findList")
+    public HttpResult findList(@RequestParam(value = "name", required = false) String name) {
+        return workFlowService.findList(name);
+    }
 
 
 

business-modules/business-mine/src/main/java/com/sckw/mine/entity/KwBusinessMine.java

@@ -34,12 +34,12 @@ public class KwBusinessMine implements Serializable {
     /**
      * 矿料数量
      */
-    private BigDecimal purchaseNum;
+    private Integer purchaseNum;
 
     /*
     矿料重量
      */
-    private BigDecimal mineWeight;
+    private String mineWeight;
 
     /**
      * create_by

business-modules/business-mine/src/main/java/com/sckw/mine/entity/dto/NodeStatusDTO.java

@@ -1,8 +1,11 @@
 package com.sckw.mine.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @desc:
  * @author: Lt
@@ -22,4 +25,13 @@ public class NodeStatusDTO {
 
 
     private String color;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date time;
+
+    private String createBy;
+
+    private Integer status;
+
+    private Integer isCancel = 0;
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineAddParam.java

@@ -69,7 +69,7 @@ public class MineAddParam {
     /*
     采购数量
      */
-    private BigDecimal purchaseNum;
+    private Integer purchaseNum;
 
     /*
     矿料体积
@@ -79,7 +79,7 @@ public class MineAddParam {
     /*
     矿料重量
      */
-    private BigDecimal mineWeight;
+    private String mineWeight;
 
     /*
     客户下单时间

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineOrderPageListParam.java

@@ -36,6 +36,14 @@ public class MineOrderPageListParam {
      */
     private String tenantId;
 
+    /*
+    矿料名称
+     */
+    private String mineName;
 
+    /*
+    采购企业
+     */
+    private String cgCompany;
 
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/MineOrderDetailRes.java

@@ -57,7 +57,7 @@ public class MineOrderDetailRes {
     /**
      * 付款单位id
      */
-    private Long fkDeptId;
+    private String fkDeptId;
 
     /**
      * 付款单位

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/MineOrderPageListRes.java

@@ -52,7 +52,7 @@ public class MineOrderPageListRes {
     /**
      * 付款单位id
      */
-    private Long fkDeptId;
+    private String fkDeptId;
 
     /**
      * 付款单位
@@ -85,6 +85,7 @@ public class MineOrderPageListRes {
      * 是否物流承接
      */
     private Integer isTransport;
+    private String isTransportStr;
 
     /**
      * 订单状态
@@ -127,15 +128,20 @@ public class MineOrderPageListRes {
     /*
     采购数量
      */
-    private BigDecimal purchaseNum;
+    private Integer purchaseNum;
 
     /*
     矿料重量
      */
-    private BigDecimal mineWeight;
+    private String mineWeight;
 
     private String transportOrderNo;
 
+    private String mineName;
+
+    private Integer unit;
+    private String unitStr;
+
 
 
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/MineralAggregateFindListRes.java

@@ -0,0 +1,44 @@
+package com.sckw.mine.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Data
+public class MineralAggregateFindListRes {
+    /**
+     * id
+     */
+    private String id;
+
+    private String code;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 矿料名称
+     */
+    private String name;
+
+    /**
+     * 矿料类型
+     */
+    private String type;
+    private String typeStr;
+
+    /**
+     * 计量单位
+     */
+    private String unit;
+    private String unitStr;
+
+}

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/TaskCardPageListRes.java

@@ -72,6 +72,8 @@ public class TaskCardPageListRes {
      */
     private String mineOrderId;
 
+    private String transportOrderNo;
+
     
 
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/WorkFlowFindListRes.java

@@ -0,0 +1,36 @@
+package com.sckw.mine.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.mine.entity.dto.WorkFlowNodeDTO;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-31
+ */
+@Data
+public class WorkFlowFindListRes {
+
+    private String id;
+
+    /*
+    流程编号
+     */
+    private String workCode;
+
+    /*
+    流程名称
+     */
+    private String workName;
+
+
+
+
+
+
+
+}

business-modules/business-mine/src/main/java/com/sckw/mine/enums/NodeTypeEnum.java

@@ -12,8 +12,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @Getter
 public enum NodeTypeEnum {
-    ONE(1, "节点类型1"),
-    TWO(2, "节点类型2")
+    ONE(1, "石灰石原料"),
+    TWO(2, "石灰石加工品")
     ;
 
     private final Integer code;

business-modules/business-mine/src/main/java/com/sckw/mine/mapper/MineralAggregateMapper.java

@@ -6,6 +6,7 @@ import com.sckw.mine.entity.KwBusinessMineralAggregate;
 import com.sckw.mine.entity.req.MineralAggPageListParam;
 import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
 import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
+import com.sckw.mine.entity.res.MineralAggregateFindListRes;
 import com.sckw.mine.entity.res.MineralAggregateListRes;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +18,8 @@ import java.util.List;
 public interface MineralAggregateMapper extends BaseMapper<KwBusinessMineralAggregate> {
 
     List<MineralAggregateListRes> mineAggregatePageList(@Param("param") MineralAggPageListParam param);
+
+    List<MineralAggregateFindListRes> findList(@Param("name") String name,@Param("tenantId") String tenantId);
     int aggreDelete(String id);
 
     int aggreUpdate(@Param("param") MineralAggregateUpdateParam param);

business-modules/business-mine/src/main/java/com/sckw/mine/mapper/WorkFlowMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.mine.entity.KwBusinessWorkFlow;
 import com.sckw.mine.entity.req.WorkFlowPageListParam;
+import com.sckw.mine.entity.res.MineralAggregateFindListRes;
+import com.sckw.mine.entity.res.WorkFlowFindListRes;
 import com.sckw.mine.entity.res.WorkFlowPageListRes;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +19,6 @@ public interface WorkFlowMapper extends BaseMapper<KwBusinessWorkFlow> {
     List<WorkFlowPageListRes> pageList(@Param("param") WorkFlowPageListParam param);
 
     int statusAction(@Param("id") String id, @Param("status") Integer status);
+
+    List<WorkFlowFindListRes> findList(@Param("name") String name, @Param("tenantId") String tenantId);
 }

business-modules/business-mine/src/main/java/com/sckw/mine/service/MineService.java

@@ -1,6 +1,7 @@
 package com.sckw.mine.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -77,10 +78,10 @@ public class MineService {
             Long orderId = new IdWorker(1L).nextId();
             KwBusinessMineOrder kwBusinessMineOrder = BeanUtil.copyProperties(mineAddParam, KwBusinessMineOrder.class);
             //生成订单编号
-            String mineOrderNo = orderServerCommon.generatorNum("M", 13);
+            String mineOrderNo = orderServerCommon.generatorNum("M", 8);
 
             //生成物流订单编号- 空了再来封装了
-            String usualTransportOrderNo = orderServerCommon.generatorNum("O", 12);
+            String usualTransportOrderNo = orderServerCommon.generatorNum("O", 8);
             kwBusinessMineOrder.setId(orderId);
             kwBusinessMineOrder.setMineOrderNo(mineOrderNo);
             kwBusinessMineOrder.setTenantId(TenantUtil.getTenant());   //租户id
@@ -106,7 +107,8 @@ public class MineService {
                 mineMapper.insert(kwBusinessMine);
             }
             //添加操作记录
-            orderServerCommon.saveActionTrack(orderId, String.valueOf(mineAddParam.getStatus()), null, "T");
+            orderServerCommon.saveActionTrack(orderId, String.valueOf(1), "确认下单", "确认下单", true);
+            orderServerCommon.saveActionTrack(orderId, String.valueOf(2), "订单审核", "订单审核", false);
 
             return "添加成功";
         } catch (Exception e) {
@@ -123,6 +125,16 @@ public class MineService {
     public HttpResult pageList(MineOrderPageListParam param) {
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<MineOrderPageListRes> businessTruckPageListRes = mineOrderMapper.mineOrderPageList(param);
+
+        Map<String, Map<String, String>> dict = orderDictService.queryDictByType(new ArrayList<>(
+                Arrays.asList(OrderDictTypeEnum.GOODS_UNIT.getType())));
+        Map<String, String> GoodsUnitMap;
+        if (CollectionUtils.isNotEmpty(dict)) {
+            GoodsUnitMap = CollectionUtils.isNotEmpty(dict.get(OrderDictTypeEnum.GOODS_UNIT.getType())) ? dict.get(OrderDictTypeEnum.GOODS_UNIT.getType()) : new HashMap<>(16);
+        } else {
+            GoodsUnitMap = new HashMap<>(16);
+        }
+
         businessTruckPageListRes.forEach(e -> {
             if (ObjectUtils.isNotNull(e.getOrderSource())) {
                 e.setOrderSourceStr(e.getOrderSource() == 1 ? "生产自建" : "销售流转");
@@ -130,6 +142,12 @@ public class MineService {
             if (ObjectUtils.isNotNull(e.getStatus())){
                 e.setStatusStr(getStatusStr(e.getStatus()));
             }
+            if (ObjectUtils.isNotNull(e.getUnit())){
+                e.setUnitStr(GoodsUnitMap.get(e.getUnit().toString()));
+            }
+            if (ObjectUtils.isNotNull(e.getIsTransport())){
+                e.setIsTransportStr(TransportUnderEnum.getNameByCode(e.getIsTransport()));
+            }
         });
         return HttpResult.ok(new PageRes<>(new PageInfo<>(businessTruckPageListRes)));
     }
@@ -295,15 +313,17 @@ public class MineService {
 
         for (int i = 0; i < orderFlowEnums.size(); i++) {
             orderFlowEnums.get(i).setColor("gray");
-
+            //orderFlowEnums.get(i).setStatus(Global.NUMERICAL_ZERO);
             for (KwBusinessActionTrack track : actionTracks) {
                 if (orderFlowEnums.get(i).getCode().equals(track.getStatus())) {
                     orderFlowEnums.get(i).setColor("green");
+                    orderFlowEnums.get(i).setTime(track.getCreateTime());
+                    orderFlowEnums.get(i).setCreateBy(track.getCreateBy());
                     cancelIndex = i; // 更新取消前最后一个执行节点的索引
                     break;
                 }
 
-                if (track.getStatus().equals("20") && !cancelFound) {
+                if ("20".equals(track.getStatus()) && !cancelFound) {
                     cancelFound = true;
                     if (cancelIndex != -1) { // 确保有一个被执行的节点在前
                         orderFlowEnums.get(cancelIndex).setColor("orange");
@@ -311,7 +331,7 @@ public class MineService {
                     }
                 }
 
-                if (track.getStatus().equals("15") && !rejectFound) {
+                if ("15".equals(track.getStatus()) && !rejectFound) {
                     rejectFound = true;
                     if (cancelIndex != -1) { // 确保有一个被执行的节点在前
                         orderFlowEnums.get(cancelIndex).setColor("orange");
@@ -322,21 +342,33 @@ public class MineService {
         }
 
         // 如果没有执行任何节点就直接取消了，且只有一个取消记录，需要特殊处理
-        if (cancelFound && cancelIndex == Global.MINUS_ONE && actionTracks.size() == Global.ADDRESS_LOAD) {
+        if (cancelFound && cancelIndex == Global.MINUS_ONE && actionTracks.size() == Global.NUMERICAL_ONE) {
             orderFlowEnums.get(0).setColor("orange");
             orderFlowEnums.get(0).setName(orderFlowEnums.get(0).getName() + cancelNameAppend);
+            orderFlowEnums.get(0).setStatus(Global.NUMERICAL_ONE);
         }
 
         // 类似的，如果直接驳回且无其他执行记录，也需要处理
-        if (rejectFound && cancelIndex == Global.MINUS_ONE && actionTracks.size() == Global.ADDRESS_LOAD) {
+        if (rejectFound && cancelIndex == Global.MINUS_ONE && actionTracks.size() == Global.NUMERICAL_ONE) {
             orderFlowEnums.get(0).setColor("orange");
             orderFlowEnums.get(0).setName(orderFlowEnums.get(0).getName() + rejectNameAppend);
+            orderFlowEnums.get(0).setStatus(Global.NUMERICAL_ONE);
+        }
+        for (NodeStatusDTO orderFlowEnum : orderFlowEnums) {
+            if (orderFlowEnum.getColor().equals("green") || orderFlowEnum.getColor().equals("orange")) {
+                if (orderFlowEnum.getColor().equals("orange")){
+                    //表示取消或者驳回
+                    orderFlowEnum.setIsCancel(Global.NUMERICAL_ONE);
+                }
+                orderFlowEnum.setStatus(Global.NUMERICAL_ONE);
+            }else{
+                orderFlowEnum.setStatus(Global.NUMERICAL_ZERO);
+            }
         }
-        return orderFlowEnums;
-        
-    }
 
+        return orderFlowEnums;
 
+    }
 
 
     /**
@@ -351,17 +383,22 @@ public class MineService {
         {
             throw new RuntimeException("未找到当前订单");
         }
-        if(kwBusinessMineorder.getIsTransport() != 2){
-            throw new RuntimeException("当前订单不是非自有订单");
-        }
         if (kwBusinessMineorder.getStatus().equals(String.valueOf(MineStatusEnum.TWENTY.getCode()))) {
             throw new RuntimeException("当前订单已取消,请勿重复操作");
         }
         kwBusinessMineorder.setStatus(String.valueOf(MineStatusEnum.TWENTY.getCode()));
         mineOrderMapper.updateById(kwBusinessMineorder);
 
+        LambdaUpdateWrapper<KwBusinessActionTrack> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+
+        //所有状态都修改成已完操作过
+        objectLambdaUpdateWrapper.set(KwBusinessActionTrack::getIsAction, Global.NUMERICAL_ONE)
+                .eq(KwBusinessActionTrack::getMineOrderId, completeOrderParam.getOrderId())
+                        .eq(KwBusinessActionTrack::getDelFlag, Global.NUMERICAL_ZERO);
+        kwBusinessActionTrackMapper.update(null, objectLambdaUpdateWrapper);
+
         String nameByCode = MineStatusEnum.getNameByCode(MineStatusEnum.TWENTY.getCode());
-        orderServerCommon.saveActionTrack(Long.valueOf(completeOrderParam.getOrderId()), String.valueOf(MineStatusEnum.TWENTY.getCode()), nameByCode,nameByCode);
+        orderServerCommon.saveActionTrack(Long.valueOf(completeOrderParam.getOrderId()), String.valueOf(MineStatusEnum.TWENTY.getCode()), nameByCode,nameByCode, false);
 
         return "取消成功";
 

business-modules/business-mine/src/main/java/com/sckw/mine/service/MineralAggregateService.java

@@ -19,6 +19,7 @@ import com.sckw.mine.entity.req.MineralAggregateInsertParam;
 import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
 import com.sckw.mine.entity.req.StatusActionReq;
 import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
+import com.sckw.mine.entity.res.MineralAggregateFindListRes;
 import com.sckw.mine.entity.res.MineralAggregateListRes;
 import com.sckw.mine.enums.MineralAggregateTypeEnum;
 import com.sckw.mine.mapper.MineralAggregateMapper;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @desc:
@@ -147,5 +149,27 @@ public class MineralAggregateService {
         }
         return HttpResult.error("操作失败");
     }
+    
+    /**
+    * @Description: 矿料查询
+    * @Author: Lt
+    * @Date: 2024/6/19 0019 15:33  
+    */
+    public HttpResult findList(String name)
+    {
+
+        String tenantId = TenantUtil.getTenant();
+        List<MineralAggregateFindListRes> businessTruckPageListRes = mineralAggregateMapper.findList(name,tenantId);
+        businessTruckPageListRes.forEach(e -> {
+            if (ObjectUtils.isNotNull(e.getUnit())){
+                e.setUnitStr(Objects.equals(e.getUnit(), "1") ?"吨":"件");
+            }
+            if (ObjectUtils.isNotNull(e.getType())){
+                e.setTypeStr(MineralAggregateTypeEnum.getNameByCode(Integer.valueOf(e.getType())));
+            }
+        });
+
+        return HttpResult.ok(businessTruckPageListRes);
+    }
 
 }

business-modules/business-mine/src/main/java/com/sckw/mine/service/TaskCardService.java

@@ -138,7 +138,7 @@ public class TaskCardService {
                 }
             }
             //执行下一个流程
-            orderServerCommon.saveActionTrack(orderId, nextNodeId, nextNodeName, nextNodeName);
+            orderServerCommon.saveActionTrack(orderId, nextNodeId, nextNodeName, nextNodeName, false);
             orderStatus = nextNodeId;
         }else{
             //未通过,驳回状态
@@ -148,13 +148,11 @@ public class TaskCardService {
                 }
             }
             String nameByCode = MineStatusEnum.getNameByCode(MineStatusEnum.FIFTEEN.getCode());
-            orderServerCommon.saveActionTrack(orderId, String.valueOf(MineStatusEnum.FIFTEEN.getCode()), nameByCode, nameByCode);
+            orderServerCommon.saveActionTrack(orderId, String.valueOf(MineStatusEnum.FIFTEEN.getCode()), nameByCode, nameByCode, false);
             orderStatus = String.valueOf(MineStatusEnum.FIFTEEN.getCode());
         }
-        //修改任务是否被操作过的状态
-        LambdaUpdateWrapper<KwBusinessActionTrack> trackUpdateWrapper = new LambdaUpdateWrapper<>();
-        trackUpdateWrapper.set(KwBusinessActionTrack::getIsAction, Global.NUMERICAL_ONE).eq(KwBusinessActionTrack::getId, trackId);
-        kwBusinessActionTrackMapper.update(null, trackUpdateWrapper);
+        //修改任务为被操作过的状态
+        updateIsAction(trackId);
 
         //修改订单状态
         LambdaUpdateWrapper<KwBusinessMineOrder> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@@ -166,6 +164,13 @@ public class TaskCardService {
         return HttpResult.ok(msg+ "成功");
     }
 
+    private void updateIsAction(String trackId)
+    {
+        LambdaUpdateWrapper<KwBusinessActionTrack> trackUpdateWrapper = new LambdaUpdateWrapper<>();
+        trackUpdateWrapper.set(KwBusinessActionTrack::getIsAction, Global.NUMERICAL_ONE).eq(KwBusinessActionTrack::getId, trackId);
+        kwBusinessActionTrackMapper.update(null, trackUpdateWrapper);
+    }
+
     /**
     * @Description: 执行项目下一步
     * @Author: Lt
@@ -222,7 +227,7 @@ public class TaskCardService {
         kwBusinessActionTrackMapper.update(null, trackUpdateWrapper);
 
         //执行任务
-        orderServerCommon.saveActionTrack(orderId, nextStatusId, nextNodeName, nextNodeName);
+        orderServerCommon.saveActionTrack(orderId, nextStatusId, nextNodeName, nextNodeName, false);
 
         //修改订单状态
         LambdaUpdateWrapper<KwBusinessMineOrder> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();

business-modules/business-mine/src/main/java/com/sckw/mine/service/WorkFlowService.java

@@ -19,6 +19,7 @@ import com.sckw.mine.entity.dto.WorkFlowNodeDTO;
 import com.sckw.mine.entity.req.WorkFlowInsertParam;
 import com.sckw.mine.entity.req.WorkFlowPageListParam;
 import com.sckw.mine.entity.req.WorkFlowUpdateParam;
+import com.sckw.mine.entity.res.WorkFlowFindListRes;
 import com.sckw.mine.entity.res.WorkFlowPageListRes;
 import com.sckw.mine.enums.WorkFlowTypeEnum;
 import com.sckw.mine.mapper.WorkFlowMapper;
@@ -227,5 +228,19 @@ public class WorkFlowService {
         return HttpResult.ok("删除成功");
     }
 
+    public HttpResult findList(String name)
+    {
+        String tenantId = TenantUtil.getTenant();
+        List<WorkFlowFindListRes> workPageListRes = workFlowMapper.findList(name, tenantId);
+        //workPageListRes.forEach(e -> {
+        //    if (ObjectUtils.isNotNull(e.getStatus())) {
+        //        e.setStatusStr(e.getStatus() == 1 ? "启用" : "禁用");
+        //        e.setWorkTypeStr(WorkFlowTypeEnum.getNameByCode(e.getWorkType()));
+        //    }
+        //});
+
+        return HttpResult.ok(workPageListRes);
+    }
+
 
 }

business-modules/business-mine/src/main/resources/mapper/KwBusinessActionTrackMapper.xml

@@ -36,13 +36,15 @@
             wf.work_name,
             ag.name,
             tk.status,
-            tk.mine_order_id mineOrderId
+            tk.mine_order_id mineOrderId,
+            nn.transport_order_no
 
             from kw_business_action_track tk
         left join kw_business_mine_order o on o.id = tk.mine_order_id
         left join kw_business_mineral_aggregate ag on ag.id = o.mineral_aggregate_id
         left join kw_business_mine m on m.mine_order_id = o.id
         left join kw_business_work_flow wf on wf.id = o.work_flow
+        left join kw_business_transport_order_no nn on nn.mine_order_id = tk.mine_order_id
         <where>
             and tk.del_flag = 0
             <if test="param.taskOrderNum != '' and param.taskOrderNum != null">

business-modules/business-mine/src/main/resources/mapper/MineOrderMapper.xml

@@ -30,11 +30,15 @@
         m.mine_vol,
         m.purchase_num,
         m.mine_weight,
-        n.transport_order_no
+        n.transport_order_no,
+        #矿料
+        ma.name mineName,
+        ma.unit
 
         from kw_business_mine_order o
         left join kw_business_transport_order_no n on n.mine_order_id = o.id
         left join kw_business_mine m on m.mine_order_id = o.id
+        left join kw_business_mineral_aggregate ma on ma.id = o.mineral_aggregate_id
         <where>
          o.del_flag = 0
             <if test="param.mineOrderNo != '' and param.mineOrderNo != null">
@@ -52,6 +56,12 @@
             <if test="param.tenantId != '' and param.tenantId != null">
                 and o.tenant_id  = #{param.tenantId}
             </if>
+            <if test="param.mineName != '' and param.mineName != null">
+                and ma.name like concat('%',#{param.mineName},'%')
+            </if>
+            <if test="param.cgCompany != '' and param.cgCompany != null">
+                and o.cg_company like concat('%',#{param.cgCompany},'%')
+            </if>
         </where>
         order by o.create_time desc
      </select>

business-modules/business-mine/src/main/resources/mapper/MineralAggregateMapper.xml

@@ -53,6 +53,18 @@
     <select id="load" resultType="com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes">
         select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate where id = #{id}
     </select>
+    <select id="findList" resultType="com.sckw.mine.entity.res.MineralAggregateFindListRes">
+        select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate
+        <where>
+            del_flag = 0
+                <if test="name != null and name != ''">
+                    and `name` like concat('%',#{name},'%')
+                </if>
+            <if test="tenantId != null and tenantId != ''">
+                and tenant_id = #{tenantId}
+            </if>
+        </where>
+    </select>
 
 
     <update id="aggreUpdate" parameterType="com.sckw.mine.entity.req.MineralAggregateUpdateParam">

business-modules/business-mine/src/main/resources/mapper/WorkFlowMapper.xml

@@ -61,6 +61,18 @@
     <select id="selectFlowNodeList" resultType="com.sckw.mine.entity.dto.WorkFlowNodeDTO">
         select id,node_name, flow_id,node_id from kw_business_work_flow_node where del_flag = 0 and flow_id = #{id}
     </select>
+    <select id="findList" resultType="com.sckw.mine.entity.res.WorkFlowFindListRes">
+        select <include refid="Base_Column_List" /> from kw_business_work_flow
+        <where>
+            del_flag = 0
+            <if test="name != null and name != ''">
+                and `name` like concat('%',#{name},'%')
+            </if>
+            <if test="tenantId != null and tenantId != ''">
+                and tenant_id = #{tenantId}
+            </if>
+        </where>
+    </select>
 
 
     <update id="statusAction">

business-modules/business-mine/src/main/resources/mapper/WorkFlowNodeMapper.xml

@@ -10,6 +10,6 @@
 
             from kw_business_work_flow_node wfn left join kw_business_node n on n.id=wfn.node_id
 
-            where wfn.flow_id = #{flowId}
+            where wfn.flow_id = #{flowId} order by wfn.sort asc
     </select>
 </mapper>

business-modules/business-usual-transport/src/main/java/com/sckw/usual/enums/OrderDictTypeEnum.java

@@ -19,6 +19,7 @@ public enum OrderDictTypeEnum {
     TRUCK_TYPE("truck_type", "车辆类型"),
     OW_SYSTEM("ow_system", "车辆类型"),
     WAYBILL_STATUS("waybill_status", "运单状态"),
+    MINE_ORDER_SOURCE("mine_order_source", "矿山域-订单来源"),
 
     ;