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

@@ -28,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());
@@ -37,7 +37,7 @@ public class OrderServerCommon {
         kwBusinessActionTrack.setStatus(status);
         kwBusinessActionTrack.setTaskOrderNum(generatorNum("T", 14));
         kwBusinessActionTrack.setRemark(remark);
-        if("8".equals(status)) {
+        if("8".equals(status) || isAction) {
             kwBusinessActionTrack.setIsAction(Global.NUMERICAL_ONE);
         }
         kwBusinessActionTrackMapper.insert(kwBusinessActionTrack);

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/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/res/MineOrderPageListRes.java

@@ -128,12 +128,12 @@ public class MineOrderPageListRes {
     /*
     采购数量
      */
-    private BigDecimal purchaseNum;
+    private Integer purchaseNum;
 
     /*
     矿料重量
      */
-    private BigDecimal mineWeight;
+    private String mineWeight;
 
     private String transportOrderNo;
 

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/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) {
@@ -317,7 +319,6 @@ public class MineService {
                     orderFlowEnums.get(i).setColor("green");
                     orderFlowEnums.get(i).setTime(track.getCreateTime());
                     orderFlowEnums.get(i).setCreateBy(track.getCreateBy());
-                    orderFlowEnums.get(i).setStatus(Global.NUMERICAL_ONE);
                     cancelIndex = i; // 更新取消前最后一个执行节点的索引
                     break;
                 }
@@ -327,9 +328,6 @@ public class MineService {
                     if (cancelIndex != -1) { // 确保有一个被执行的节点在前
                         orderFlowEnums.get(cancelIndex).setColor("orange");
                         orderFlowEnums.get(cancelIndex).setName(orderFlowEnums.get(cancelIndex).getName() + cancelNameAppend); // 添加取消字样
-                        orderFlowEnums.get(i).setTime(track.getCreateTime());
-                        orderFlowEnums.get(i).setCreateBy(track.getCreateBy());
-                        orderFlowEnums.get(i).setStatus(Global.NUMERICAL_ONE);
                     }
                 }
 
@@ -338,9 +336,6 @@ public class MineService {
                     if (cancelIndex != -1) { // 确保有一个被执行的节点在前
                         orderFlowEnums.get(cancelIndex).setColor("orange");
                         orderFlowEnums.get(cancelIndex).setName(orderFlowEnums.get(cancelIndex).getName() + rejectNameAppend); // 添加驳回字样
-                        orderFlowEnums.get(i).setTime(track.getCreateTime());
-                        orderFlowEnums.get(i).setCreateBy(track.getCreateBy());
-                        orderFlowEnums.get(i).setStatus(Global.NUMERICAL_ONE);
                     }
                 }
             }
@@ -351,7 +346,6 @@ public class MineService {
             orderFlowEnums.get(0).setColor("orange");
             orderFlowEnums.get(0).setName(orderFlowEnums.get(0).getName() + cancelNameAppend);
             orderFlowEnums.get(0).setStatus(Global.NUMERICAL_ONE);
-            //orderFlowEnums.get(0).setIsCancel(Global.NUMERICAL_ONE);
         }
 
         // 类似的，如果直接驳回且无其他执行记录，也需要处理
@@ -359,7 +353,6 @@ public class MineService {
             orderFlowEnums.get(0).setColor("orange");
             orderFlowEnums.get(0).setName(orderFlowEnums.get(0).getName() + rejectNameAppend);
             orderFlowEnums.get(0).setStatus(Global.NUMERICAL_ONE);
-            //orderFlowEnums.get(0).setIsCancel(Global.NUMERICAL_ONE);
         }
         for (NodeStatusDTO orderFlowEnum : orderFlowEnums) {
             if (orderFlowEnum.getColor().equals("green") || orderFlowEnum.getColor().equals("orange")) {
@@ -378,8 +371,6 @@ public class MineService {
     }
 
 
-
-
     /**
     * @Description: 取消
     * @Author: Lt
@@ -398,8 +389,16 @@ public class MineService {
         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,7 +148,7 @@ 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());
         }
         //修改任务为被操作过的状态
@@ -227,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/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} order by wfn.sort asc
+            where wfn.del_flag = 0 and  wfn.flow_id = #{flowId} order by wfn.sort asc
     </select>
 </mapper>