Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/BonusMaterialApplication.java

@@ -10,11 +10,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 系统模块
- * 
+ *
  * @author bonus
  */
 @EnableCustomConfig
-@EnableCustomSwagger2
+//@EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication(scanBasePackages = {"com.bonus.common.biz.*", "com.bonus.material.*"}, exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
+import com.bonus.material.ma.domain.vo.MaTypeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,4 +142,43 @@ public class TypeRepairController extends BaseController
     {
         return toAjax(typeRepairService.deleteTypeRepairByUserIdAndTypeId(typeRepairs));
     }
+
+    /**
+     * 新增人员配置
+     */
+    @ApiOperation(value = "新增人员配置")
+    @PreventRepeatSubmit
+    @RequiresPermissions("ma:manage:add")
+    @SysLog(title = "新增人员配置", businessType = OperaType.INSERT, module = "仓储管理->新增人员配置")
+    @PostMapping("/addTypeManage")
+    public AjaxResult addTypeManage(@RequestBody List<TypeRepair> typeRepairs)
+    {
+        return toAjax(typeRepairService.addTypeManage(typeRepairs));
+    }
+
+    /**
+     * 查询人员配置列表
+     */
+    @ApiOperation(value = "查询人员配置列表")
+    @RequiresPermissions("ma:manage:list")
+    @GetMapping("/getTypeManageList")
+    public TableDataInfo getTypeManageList(MaTypeVo maTypeVo)
+    {
+        startPage();
+        List<MaTypeVo> list = typeRepairService.getTypeManageList(maTypeVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 删除维修班机具配置
+     */
+    @ApiOperation(value = "删除单个维修班机具配置")
+    @PreventRepeatSubmit
+    @RequiresPermissions("ma:manage:remove")
+    @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, module = "仓储管理->删除单个维修班机具配置")
+    @PostMapping("/unbindTypeManage")
+    public AjaxResult unbindTypeManage(@RequestBody List<TypeRepair> typeRepairs)
+    {
+        return toAjax(typeRepairService.deleteTypeManageByUserIdAndTypeId(typeRepairs));
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/TypeRepair.java

@@ -25,6 +25,11 @@ public class TypeRepair extends BaseEntity {
     /** 类型ID */
     private Long typeId;
 
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
     /** 用户 */
     @Excel(name = "用户")
     @ApiModelProperty(value = "用户")

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeRepairMapper.java

@@ -4,18 +4,19 @@ import java.util.List;
 
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.ma.domain.TypeRepair;
+import com.bonus.material.ma.domain.vo.MaTypeVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
  * 维修班机具配置Mapper接口
- * 
+ *
  * @author xsheng
  * @date 2024-09-27
  */
 public interface TypeRepairMapper {
     /**
      * 查询维修班机具配置
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 维修班机具配置
      */
@@ -23,7 +24,7 @@ public interface TypeRepairMapper {
 
     /**
      * 查询维修班机具配置列表
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 维修班机具配置集合
      */
@@ -36,7 +37,7 @@ public interface TypeRepairMapper {
 
     /**
      * 新增维修班机具配置
-     * 
+     *
      * @param typeRepairs 维修班机具配置
      * @return 结果
      */
@@ -44,7 +45,7 @@ public interface TypeRepairMapper {
 
     /**
      * 修改维修班机具配置
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 结果
      */
@@ -52,7 +53,7 @@ public interface TypeRepairMapper {
 
     /**
      * 删除维修班机具配置
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 结果
      */
@@ -60,7 +61,7 @@ public interface TypeRepairMapper {
 
     /**
      * 批量删除维修班机具配置
-     * 
+     *
      * @param IDs 需要删除的数据主键集合
      * @return 结果
      */
@@ -79,4 +80,19 @@ public interface TypeRepairMapper {
      * @return
      */
     List<TypeRepair> getRepairList(TypeRepair typeRepair);
+
+    /**
+     *删除人员配置
+     */
+    int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs);
+
+    /**
+     * 新增人员配置
+     */
+    int insertTypeManage(List<TypeRepair> typeRepairs);
+
+    /**
+     * 查询人员配置列表
+     */
+    List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java

@@ -4,17 +4,18 @@ import java.util.List;
 
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.ma.domain.TypeRepair;
+import com.bonus.material.ma.domain.vo.MaTypeVo;
 
 /**
  * 维修班机具配置Service接口
- * 
+ *
  * @author xsheng
  * @date 2024-09-27
  */
 public interface ITypeRepairService {
     /**
      * 查询维修班机具配置
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 维修班机具配置
      */
@@ -22,7 +23,7 @@ public interface ITypeRepairService {
 
     /**
      * 查询维修班机具配置列表
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 维修班机具配置集合
      */
@@ -35,7 +36,7 @@ public interface ITypeRepairService {
 
     /**
      * 新增维修班机具配置
-     * 
+     *
      * @param typeRepairs 维修班机具配置
      * @return 结果
      */
@@ -43,7 +44,7 @@ public interface ITypeRepairService {
 
     /**
      * 修改维修班机具配置
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 结果
      */
@@ -51,7 +52,7 @@ public interface ITypeRepairService {
 
     /**
      * 批量删除维修班机具配置
-     * 
+     *
      * @param IDs 需要删除的维修班机具配置主键集合
      * @return 结果
      */
@@ -59,7 +60,7 @@ public interface ITypeRepairService {
 
     /**
      * 删除维修班机具配置信息
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 结果
      */
@@ -76,4 +77,21 @@ public interface ITypeRepairService {
      * @return
      */
     AjaxResult getRepairList(TypeRepair typeRepair);
+
+    /**
+     * 新增人员配置
+     */
+    int addTypeManage(List<TypeRepair> typeRepairs);
+
+    /**
+     * 查询人员配置列表
+     */
+    List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo);
+
+    /**
+     * 删除维修班机具配置
+     * @param typeRepairs
+     * @return
+     */
+    int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java

@@ -3,6 +3,7 @@ package com.bonus.material.ma.service.impl;
 import java.util.List;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.material.ma.domain.vo.MaTypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.material.ma.mapper.TypeRepairMapper;
@@ -12,7 +13,7 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * 维修班机具配置Service业务层处理
- * 
+ *
  * @author xsheng
  * @date 2024-09-27
  */
@@ -24,7 +25,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 查询维修班机具配置
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 维修班机具配置
      */
@@ -36,7 +37,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 查询维修班机具配置列表
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 维修班机具配置
      */
@@ -58,7 +59,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 新增维修班机具配置
-     * 
+     *
      * @param typeRepairs 维修班机具配置
      * @return 结果
      */
@@ -75,7 +76,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 修改维修班机具配置
-     * 
+     *
      * @param typeRepair 维修班机具配置
      * @return 结果
      */
@@ -88,7 +89,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 批量删除维修班机具配置
-     * 
+     *
      * @param IDs 需要删除的维修班机具配置主键
      * @return 结果
      */
@@ -100,7 +101,7 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
 
     /**
      * 删除维修班机具配置信息
-     * 
+     *
      * @param ID 维修班机具配置主键
      * @return 结果
      */
@@ -129,4 +130,39 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
     public AjaxResult getRepairList(TypeRepair typeRepair) {
         return AjaxResult.success(typeRepairMapper.getRepairList(typeRepair));
     }
+
+    /**
+     * 新增人员配置
+     */
+    @Override
+    public int addTypeManage(List<TypeRepair> typeRepairs) {
+        if (CollectionUtils.isEmpty(typeRepairs)) {
+            return 0;
+        }
+        typeRepairs.forEach(typeRepair -> typeRepair.setCreateTime(DateUtils.getNowDate()));
+        typeRepairMapper.deleteTypeManageByUserIdAndTypeId(typeRepairs);
+        return typeRepairMapper.insertTypeManage(typeRepairs);
+    }
+
+    /**
+     * 查询人员配置列表
+     */
+    @Override
+    public List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo) {
+
+        return typeRepairMapper.getTypeManageList(maTypeVo);
+
+    }
+
+    /**
+     * 删除维修班机具配置
+     * @param typeRepairs
+     * @return
+     */
+    @Override
+    public int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs) {
+        return typeRepairMapper.deleteTypeManageByUserIdAndTypeId(typeRepairs);
+    }
+
+
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java

@@ -234,11 +234,13 @@ public class PartArrivedServiceImpl implements IPartArrivedService
             }
             if(!CollectionUtils.isEmpty(partTypeCheckDetails)) {
                 BigDecimal purchaseNum = new BigDecimal(0);
+                BigDecimal inputNum = new BigDecimal(0);
                 BigDecimal purchasePrice = new BigDecimal(0);
                 BigDecimal purchaseTaxPrice = new BigDecimal(0);
                 String partName = "";
                 for (int j = 0; j < partTypeCheckDetails.size(); j++) {
                     purchaseNum = purchaseNum.add(partTypeCheckDetails.get(j).getPurchaseNum());
+                    inputNum = inputNum.add(partTypeCheckDetails.get(j).getInputNum());
                     purchasePrice = purchasePrice.add(partTypeCheckDetails.get(j).getPurchasePrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
                     purchaseTaxPrice = purchaseTaxPrice.add(partTypeCheckDetails.get(j).getPurchaseTaxPrice().multiply(partTypeCheckDetails.get(j).getPurchaseNum()));
                     partName = partName + partTypeCheckDetails.get(j).getMaTypeName();
@@ -246,6 +248,7 @@ public class PartArrivedServiceImpl implements IPartArrivedService
                         partName += ",";
                     }
                 }
+                partTypeCheckInfos.get(i).setInputMaNumber(inputNum);
                 partTypeCheckInfos.get(i).setPurchaseMaNumber(purchaseNum);
                 partTypeCheckInfos.get(i).setPurchasePrice(purchasePrice);
                 partTypeCheckInfos.get(i).setPurchaseTaxPrice(purchaseTaxPrice);
@@ -387,8 +390,8 @@ public class PartArrivedServiceImpl implements IPartArrivedService
         if (!CollectionUtils.isEmpty(partTypeCheckDto.getPartTypeCheckDetailsList())) {
             partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(Objects::isNull);
             partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o -> Objects.isNull(o.getStatus()));
-            partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o ->
+//            partTypeCheckDto.getPartTypeCheckDetailsList().removeIf(o ->
-                    !Objects.equals(o.getStatus(), 0));
+//                    !Objects.equals(o.getStatus(), 0));
         }
         try {
             Long[] ids = new Long[partTypeCheckDto.getPartTypeCheckDetailsList().size()];

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml

@@ -228,8 +228,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and mt.type_name like concat('%',#{typeModelName},'%')
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND (lod.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+            AND (lai.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
-                or bcd.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))
+                or baif.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))
         </if>
         <if test="statusName != null and statusName != ''">
             AND (

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/DirectRotationMapper.xml

@@ -128,7 +128,7 @@
                     and bui.unit_id = #{unitId}
                 </if>
                 <if test="status != null and status != ''">
-                    and dai.status = #{status}
+                    and swr.workflow_status = #{status}
                 </if>
                 <if test="isApp != null and taskStatus==0">and dai.status = 0 </if>
                 <if test="isApp != null and taskStatus==1">and (dai.status = 1 or dai.status = 2)</if>

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml

@@ -19,17 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTypeRepairList" parameterType="com.bonus.material.ma.domain.TypeRepair" resultMap="TypeRepairResult">
         <include refid="selectTypeRepairVo"/>
-        <where>  
+        <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
         </where>
     </select>
-    
+
     <select id="selectTypeRepairByID" parameterType="Long" resultMap="TypeRepairResult">
         <include refid="selectTypeRepairVo"/>
         where ID = #{ID}
     </select>
-        
+
     <insert id="insertTypeRepair" parameterType="com.bonus.material.ma.domain.TypeRepair" useGeneratedKeys="true" keyProperty="ID">
         insert into ma_type_repair (type_id,user_id,create_time,update_time,company_id)
         values
@@ -43,6 +43,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </foreach>
     </insert>
+    <insert id="insertTypeManage">
+        insert into ma_type_manage (type_id,user_id,create_time,update_time,company_id)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.typeId},
+            #{item.userId},
+            #{item.createTime},
+            #{item.updateTime},
+            #{item.companyId}
+            )
+        </foreach>
+    </insert>
 
     <update id="updateTypeRepair" parameterType="com.bonus.material.ma.domain.TypeRepair">
         update ma_type_repair
@@ -61,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTypeRepairByIDs" parameterType="String">
-        delete from ma_type_repair where ID in 
+        delete from ma_type_repair where ID in
         <foreach item="ID" collection="array" open="(" separator="," close=")">
             #{ID}
         </foreach>
@@ -93,6 +106,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mtk.user_id,
             su.nick_name
     </select>
+    <select id="getTypeManageList" resultType="com.bonus.material.ma.domain.vo.MaTypeVo">
+        SELECT DISTINCT
+        mt.type_id as typeId,
+        mt.type_name as typeName,
+        mtm.user_id as keeperUserId,
+        su.nick_name as keeperUserName
+        FROM
+        ma_type mt
+        LEFT JOIN wh_house_set mhs on mt.type_id = mhs.type_id
+        LEFT JOIN ma_type_manage mtm on mt.type_id = mtm.type_id
+        LEFT JOIN sys_user su on su.user_id = mtm.user_id
+        <where>
+            <if test="level == 1">
+                and mt.type_id = #{typeId}
+            </if>
+            and mt.type_id is not null
+            and mhs.house_id = #{houseId} and mhs.del_flag = 0
+
+        </where>
+    </select>
 
     <delete id="deleteTypeRepairByUserIdAndTypeId">
         delete from ma_type_repair where
@@ -106,4 +139,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.userId}
         </foreach>
     </delete>
-</mapper>
+    <delete id="deleteTypeManageByUserIdAndTypeId">
+        delete from ma_type_manage where
+        type_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.typeId}
+        </foreach>
+        and
+        user_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.userId}
+        </foreach>
+    </delete>
+</mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml

@@ -123,16 +123,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 <![CDATA[and DATE_FORMAT( ppi.arrival_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
             </if>
+        and t.task_status!=12
         </where>
         order by ppi.create_time desc
     </select>
 
     <select id="selectPartTypeCheckDetailsList" resultType="com.bonus.material.part.domain.PartTypeCheckDetails">
-        select part_id as partId,mpt.pa_name as maTypeName,purchase_price as purchasePrice,purchase_tax_price as purchaseTaxPrice,
+        select part_id                  as partId,
-               purchase_num as purchaseNum,ppd.status as status
+               mpt.pa_name              as maTypeName,
+               purchase_price           as purchasePrice,
+               purchase_tax_price       as purchaseTaxPrice,
+               purchase_num             as purchaseNum,
+               ppd.status               as status,
+               IFNULL(ppd.input_num, 0) as inputNum
         from purchase_part_details ppd
-        left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0
+                 left join ma_part_type mpt on ppd.part_id = mpt.pa_id and mpt.del_flag = 0
-        where ppd.task_id = #{taskId} and ppd.del_flag = 0
+        where ppd.task_id = #{taskId}
+          and ppd.del_flag = 0
     </select>
 
     <select id="selectPartTypeCheckDetailsListByQueryDto" resultType="com.bonus.material.part.domain.PartTypeCheckDetails">
@@ -153,6 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productionTime != null">
             and  date_format(ppd.production_time,'%y%m%d') = date_format(#{productionTime},'%y%m%d')
         </if>
+        <if test="keyWord != null and keyWord!=''">
+            and (
+            mpt.pa_name like concat('%', #{keyWord}, '%') or
+            mpt3.pa_name like concat('%', #{keyWord}, '%') or
+            mpt2.pa_name like concat('%', #{keyWord}, '%')
+            )
+        </if>
     </select>
     <select id="selectPartTypeCheckInfoById" resultType="com.bonus.material.part.domain.PartTypeCheckInfo">
         select

bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml

@@ -49,7 +49,7 @@
             )
         </if>
         <if test="status != null and status!=''">
-            AND sra.status = #{status}
+            AND swr.workflow_status = #{status}
         </if>
         <if test="taskStatus !=null">
             AND sra.status = #{taskStatus}

bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml

@@ -55,7 +55,7 @@
             </if>
 
             <if test="status != null and status != ''">
-                and dai.status = #{status}
+                and swr.workflow_status = #{status}
             </if>
             <if test="isApp != null and taskStatus==0">and dai.status = 0 </if>
             <if test="isApp != null and taskStatus==1">and (dai.status = 1 or dai.status = 2)</if>

bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml

@@ -63,8 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_workflow_node swn
         left join sys_workflow_config  sec on swn.id= sec.node_id
         where swn.type_id=#{typeId}
-        <if test="nodeName != null "> and type_name like concat('%', #{typeName}, '%')</if>
+        <if test="nodeName != null "> and swn.node_name like concat('%', #{nodeName}, '%')</if>
-        <if test="nodeSignType != null "> and node_sign_type = #{nodeSignType}</if>
+        <if test="nodeSignType != null "> and swn.node_sign_type = #{nodeSignType}</if>
         GROUP BY swn.id ORDER BY swn.node_sort
     </select>
     <select id="listByTaskId" resultType="com.bonus.material.work.domain.SysWorkflowNode">