Merge remote-tracking branch 'origin/dev_hjj_522'

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -360,7 +360,7 @@ public class PdaController extends BaseController {
     @ApiOperation("货物录入列表")
     public TableDataInfo goodsInputList(@RequestBody PDAGoodsInputDTO pdaInventoryDTO){
         startPage();
-        List<MaterialInput> list = materialInputService.list(new LambdaQueryWrapperX<MaterialInput>().eq(MaterialInput::getDepotId,pdaInventoryDTO.getDepotId()));
+        List<MaterialInput> list = materialInputService.listBy(pdaInventoryDTO);
         return getDataTable(list);
     }
 

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java

@@ -38,7 +38,7 @@ public interface DepotItemMapper  extends BaseMapperX<DepotItem>{
      * @param id 单据子表ID
      * @return  PDA打印信息
      */
-    PDAPrintVo pdaPrintMaterial(@Param("id")Long id) ;
+    PDAPrintVo pdaPrintMaterial(@Param("id") Long id) ;
 
     long countByExample(DepotItemExample example);
 

src/main/java/com/jsh/erp/datasource/mappers/MaterialInputMapper.java

@@ -1,8 +1,12 @@
 package com.jsh.erp.datasource.mappers;
 
 import com.jsh.erp.datasource.entities.MaterialInput;
+import com.jsh.erp.datasource.pda.dto.PDAGoodsInputDTO;
+
+import java.util.List;
 
 public interface MaterialInputMapper extends BaseMapperX<MaterialInput> {
 
+    List<MaterialInput> listBy(PDAGoodsInputDTO pdaInventoryDTO);
 
 }

src/main/java/com/jsh/erp/service/MaterialInputService.java

@@ -3,10 +3,18 @@ package com.jsh.erp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jsh.erp.datasource.dto.MaterialInputDto;
 import com.jsh.erp.datasource.entities.MaterialInput;
+import com.jsh.erp.datasource.pda.dto.PDAGoodsInputDTO;
+
+import java.util.List;
 
 public interface MaterialInputService extends IService<MaterialInput> {
 
     /**
+     * PDA货物录入列表
+     */
+    List<MaterialInput> listBy(PDAGoodsInputDTO pdaInventoryDTO);
+
+    /**
      * 添加商品录入信息
      * @param materialInput
      */

src/main/java/com/jsh/erp/service/impl/AuditServiceImpl.java

@@ -18,6 +18,7 @@ import com.jsh.erp.exception.ServiceException;
 import com.jsh.erp.query.LambdaQueryWrapperX;
 import com.jsh.erp.service.*;
 import com.jsh.erp.utils.PageUtils;
+import com.jsh.erp.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -110,7 +111,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
             }
         } catch (Exception e) {
             log.error("创建审核流程失败", e);
-            throw new ServiceException(e.getMessage());
+            throw new ServiceException(StringUtil.isEmpty(e.getMessage()) ? "创建审核流程失败" : e.getMessage());
         }
         return true;
     }

src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -2229,7 +2229,7 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
                 msg.setMsgContent(String.format("您有一条新的拣货任务（单号：%s）请点击查看并及时处理",depotHead.getNumber()));
             }
             msg.setCreateTime(new Date());
-            msg.setType("复核任务");
+            msg.setType(depotHead.getSubType().equals("采购订单") ? "入库任务" : "拣货任务");
             msg.setUserId(v.getId());
             msg.setStatus(1);
             msgList.add(msg);

src/main/java/com/jsh/erp/service/impl/MaterialBatchServiceImpl.java

@@ -118,6 +118,7 @@ public class MaterialBatchServiceImpl extends ServiceImpl<MaterialBatchMapper,Ma
             }
             depotHeadService.update(new UpdateWrapper<DepotHead>().set("status",2).eq("id",dhId));
         }
+        depotHeadService.sendMsg(dhId);
     }
 
     /**

src/main/java/com/jsh/erp/service/impl/MaterialInputServiceImpl.java

@@ -7,6 +7,7 @@ import com.jsh.erp.datasource.entities.MaterialInput;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.AuditProcessMapper;
 import com.jsh.erp.datasource.mappers.MaterialInputMapper;
+import com.jsh.erp.datasource.pda.dto.PDAGoodsInputDTO;
 import com.jsh.erp.exception.ServiceException;
 import com.jsh.erp.query.LambdaQueryWrapperX;
 import com.jsh.erp.service.AuditService;
@@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -39,6 +41,13 @@ public class MaterialInputServiceImpl extends ServiceImpl<MaterialInputMapper,Ma
     private UserService userService;
 
 
+    /**
+     * PDA货物录入列表
+     */
+    @Override
+    public List<MaterialInput> listBy(PDAGoodsInputDTO pdaInventoryDTO) {
+        return materialInputMapper.listBy(pdaInventoryDTO);
+    }
 
     /**
      * 添加商品录入信息

src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -695,7 +695,7 @@
     LEFT JOIN jsh_material m ON di.material_id = m.id
     LEFT JOIN jsh_supplier s ON dh.organ_id = s.id
     LEFT JOIN material_batch mb ON (SELECT id FROM jsh_depot_item WHERE link_id = di.id LIMIT 1) = mb.depot_item_id
-    WHERE di.id = #{depotItemId}
+    WHERE di.id = #{id}
   </select>
 
 

src/main/resources/mapper_xml/MaterialInputMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jsh.erp.datasource.mappers.MaterialInputMapper">
+
+    <select id="listBy" parameterType="com.jsh.erp.datasource.pda.dto.PDAGoodsInputDTO" resultType="com.jsh.erp.datasource.entities.MaterialInput">
+        SELECT
+        id,number,`name`,bar_code,standard,production_date,img_name,depot_id,position,create_time
+        FROM
+        material_input
+        WHERE
+        ifnull(delete_flag,'0') !='1'
+        AND depot_id = #{depotId}
+        <if test="keyword != null and keyword !=''">
+            <bind name="bindKey" value="'%'+keyword+'%'"/>
+            and (bar_code like #{bindKey} or name like #{bindKey})
+        </if>
+        ORDER BY create_time DESC
+    </select>
+
+</mapper>

src/main/resources/mapper_xml/UserMapper.xml

@@ -404,7 +404,7 @@
       username AS label
     FROM
       jsh_user
-    WHERE IFNULL(delete_flag,'1') != 1
+    WHERE IFNULL(delete_flag,'0') != 1
   </select>
 
   <select id="getAuditUserIds" parameterType="java.lang.Long" resultType="java.lang.Long">