[feat]

基础资料 员工领料
修改员工领料实体类物料数量类型为Integer；
新增根据领料单号查找领料单service和mapper方法；

ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrderChild.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
+
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -61,7 +63,7 @@ public class BaseEmpRequisiteOrderChild extends BaseEntity
 
     /** 物料的数量 */
     @Excel(name = "物料的数量")
-    private Long materialNum;
+    private Integer materialNum;
 
     /** 物料的不含税单价(RMB) */
     @Excel(name = "物料的不含税单价(RMB)")
@@ -206,12 +208,12 @@ public class BaseEmpRequisiteOrderChild extends BaseEntity
     {
         return describe;
     }
-    public void setMaterialNum(Long materialNum) 
+    public void setMaterialNum(Integer materialNum)
     {
         this.materialNum = materialNum;
     }
 
-    public Long getMaterialNum() 
+    public Integer getMaterialNum()
     {
         return materialNum;
     }

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderMapper.java

@@ -77,4 +77,7 @@ public interface BaseEmpRequisiteOrderMapper
     public int restoreBaseEmpRequisiteOrderById(Long requisiteId);
 
     public List<BaseEmpRequisiteOrderVO> selectBaseEmpRequisiteOrderByIds(String[] requisiteIds);
+
+    /** 根据领料单号查找领料单*/
+    public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java

@@ -82,4 +82,7 @@ public interface IBaseEmpRequisiteOrderService
      *  审批流程启动
      * */
     ProcessInstance submitApply(BaseEmpRequisiteOrderVO baseEmpRequisiteOrderVO);
+
+    /** 根据领料单号查找领料单*/
+    public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java

@@ -459,4 +459,10 @@ public class BaseEmpRequisiteOrderServiceImpl implements IBaseEmpRequisiteOrderS
             variables.put("authority",2);
         }
     }
+
+    /** 根据领料单号查找领料单*/
+    @Override
+    public BaseEmpRequisiteOrder selectBaseEmpRequisiteOrderByCode(String requisitionCode){
+        return baseEmpRequisiteOrderMapper.selectBaseEmpRequisiteOrderByCode(requisitionCode);
+    }
 }

ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml

@@ -33,7 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseEmpRequisiteOrderChildVo">
-        select requisitioning_child_id, quote_id, material_id, material_code, photoUrl, material_name, material_type, material_model, specifications, brand, `describe`, materialNum, materialRmb, materialNoRmb, materialNoRmbSum, materialRmbSum, remark, create_by, create_time, update_by, update_time, use_status, audit_status, unit, process_method from base_emp_requisite_order_child
+        select requisitioning_child_id, quote_id, material_id, material_code, photoUrl,
+               material_name, material_type, material_model, specifications, brand,
+               `describe`, materialNum, materialRmb, materialNoRmb, materialNoRmbSum,
+               materialRmbSum, remark, create_by, create_time, update_by, update_time,
+               use_status, audit_status, unit, process_method
+        from base_emp_requisite_order_child
     </sql>
 
     <select id="selectBaseEmpRequisiteOrderChildList" parameterType="BaseEmpRequisiteOrderChild" resultMap="BaseEmpRequisiteOrderChildResult">

ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderMapper.xml

@@ -171,4 +171,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update base_emp_requisite_order set del_flag = '0' where requisite_id = #{requisiteId}
     </update>
 
+    <select id="selectBaseEmpRequisiteOrderByCode" parameterType="String" resultMap="BaseEmpRequisiteOrderResult">
+        <include refid="selectBaseEmpRequisiteOrderVo"/>
+        where requisitie_code = #{requisitieCode}
+    </select>
+
 </mapper>