[feat]

基础资料 员工领料单
修改员工领料单详情实体类，新增物料单位、加工方式字段；
修改领料详情mapper查询、插入、更新方法，新增字段；
修改领料service接口，修改生成单号前缀；
修改列表显示页面，表格增加流程相关；
仓库管理 出库单
修改出库单service接口，生成出库单详情方法新增单位、加工方式字段；

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

@@ -87,6 +87,26 @@ public class BaseEmpRequisiteOrderChild extends BaseEntity
     @Excel(name = "审核状态")
     private String auditStatus;
 
+    private String unit;
+
+    private String processMethod;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getProcessMethod() {
+        return processMethod;
+    }
+
+    public void setProcessMethod(String processMethod) {
+        this.processMethod = processMethod;
+    }
+
     public void setRequisitioningChildId(Long requisitioningChildId)
     {
         this.requisitioningChildId = requisitioningChildId;

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

@@ -169,7 +169,7 @@ public class BaseEmpRequisiteOrderServiceImpl implements IBaseEmpRequisiteOrderS
         baseEmpRequisiteOrderVO.setCreateBy(loginName);
         baseEmpRequisiteOrderVO.setCreateTime(DateUtils.getNowDate());
         if (baseEmpRequisiteOrderVO.getRequisitieCode() == null) {
-            baseEmpRequisiteOrderVO.setRequisitieCode(redisCache.generateBillNo("QG"));
+            baseEmpRequisiteOrderVO.setRequisitieCode(redisCache.generateBillNo("YGLL"));
         }
         List<BaseEmpRequisiteOrderChild> childList = baseEmpRequisiteOrderVO.getBaseEmpRequisiteOrderChildList();
         Long materialSum = 0L;
@@ -215,7 +215,7 @@ public class BaseEmpRequisiteOrderServiceImpl implements IBaseEmpRequisiteOrderS
         baseEmpRequisiteOrderVO.setUpdateTime(DateUtils.getNowDate());
         baseEmpRequisiteOrderChildMapper.deleteBaseEmpRequisiteOrderChildByCode(baseEmpRequisiteOrderVO.getRequisitieCode());
         if (baseEmpRequisiteOrderVO.getRequisitieCode() == null) {
-            baseEmpRequisiteOrderVO.setRequisitieCode(redisCache.generateBillNo("QG"));
+            baseEmpRequisiteOrderVO.setRequisitieCode(redisCache.generateBillNo("YGLL"));
         }
         List<BaseEmpRequisiteOrderChild> childList = baseEmpRequisiteOrderVO.getBaseEmpRequisiteOrderChildList();
         Long materialSum = 0L;

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java

@@ -848,10 +848,10 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
         }else {
             warehouseOutOrder.setRelatedOrderCode(empRequisiteCode);
         }
-        String relatedCode = baseEmpRequisiteOrderVO.getCorrelationCode();
-        if (StringUtils.isEmpty(relatedCode)){
-            log.warn("关联订单号为空:{}",relatedCode);
-        }
+//        String relatedCode = baseEmpRequisiteOrderVO.getCorrelationCode();
+//        if (StringUtils.isEmpty(relatedCode)){
+//            log.warn("关联订单号为空:{}",relatedCode);
+//        }
 
         //出库状态为 待仓库准备物料
         warehouseOutOrder.setWarehouseOutStatus("0");
@@ -889,9 +889,9 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
                 warehouseOutOrderDetail.setMaterialType(child.getMaterialType());
                 warehouseOutOrderDetail.setMaterialBrand(child.getBrand());
                 warehouseOutOrderDetail.setMaterialPhotourl(child.getPhotoUrl());
-//            warehouseOutOrderDetail.setMaterialUnit(child.getUnit());
+                warehouseOutOrderDetail.setMaterialUnit(child.getUnit());
                 warehouseOutOrderDetail.setMaterialDescribe(child.getDescribe());
-//            warehouseOutOrderDetail.setMaterialProcessMethod(child.getProcessMethod());
+                warehouseOutOrderDetail.setMaterialProcessMethod(child.getProcessMethod());
                 warehouseOutOrderDetail.setEnterpriseSum(Math.toIntExact(child.getMaterialNum()));
                 warehouseOutOrderDetail.setMakeNum(Math.toIntExact(child.getMaterialNum()));
                 warehouseOutOrderDetail.setCreateTime(DateUtils.getNowDate());

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

@@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="useStatus"    column="use_status"    />
         <result property="auditStatus"    column="audit_status"    />
+        <result property="unit"    column="unit"    />
+        <result property="processMethod"    column="process_method"    />
     </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 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">
@@ -54,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialNoRmbSum != null "> and materialNoRmbSum = #{materialNoRmbSum}</if>
             <if test="materialRmbSum != null "> and materialRmbSum = #{materialRmbSum}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="unit != null "> and unit = #{unit}</if>
+            <if test="processMethod != null  and processMethod != ''"> and process_method = #{processMethod}</if>
         </where>
     </select>
     
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="useStatus != null">use_status,</if>
             <if test="auditStatus != null">audit_status,</if>
+            <if test="unit != null">unit,</if>
+            <if test="processMethod != null">process_method,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="quoteId != null">#{quoteId},</if>
@@ -116,6 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="useStatus != null">#{useStatus},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="processMethod != null">#{processMethod},</if>
          </trim>
     </insert>
 
@@ -144,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="useStatus != null">use_status = #{useStatus},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="processMethod != null">process_method = #{processMethod},</if>
         </trim>
         where requisitioning_child_id = #{requisitioningChildId}
     </update>

ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html

@@ -86,6 +86,71 @@
                 columns: [
                     {checkbox: true},
                     {title: '员工号领料单索引id',field: 'requisiteId',visible: false},
+                    {
+                        field: 'instanceId',
+                        title: '流程实例ID',
+                        visible: false
+                    },
+                    {
+                        field: 'submitInstanceId',
+                        title: '流程提交实例ID',
+                        visible: false
+                    },
+                    {
+                        field: 'cancelInstanceId',
+                        title: '流程作废实例ID',
+                        visible: false
+                    },
+                    {
+                        field: 'restoreInstanceId',
+                        title: '流程恢复实例ID',
+                        visible: false
+                    },
+                    {
+                        field: 'instanceTypeName',
+                        title: '流程实例类型',
+                        visible: false
+                    },
+                    {
+                        field: 'applyUser',
+                        title: '申请人ID',
+                        visible: false
+                    },
+                    {
+                        field: 'applyUserName',
+                        title: '<span style="color: red;">申请人</span>',
+                        formatter: function(value, row, index) {
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    },
+                    {
+                        field: 'applyTime',
+                        title: '申请时间'
+                    },
+                    {
+                        field: 'taskId',
+                        title: '当前任务ID',
+                        visible: false
+                    },
+                    {
+                        field: 'todoUserId',
+                        title: '待办用户ID',
+                        visible: false
+                    },
+                    {
+                        field: 'taskName',
+                        title: '当前状态',
+                        align: 'center',
+                        formatter: function(value, row, index)  {
+                            if(row.auditStatus!="1"&&value != "未启动"){
+                                return '<span class="badge badge-danger">' + value + '</span>';
+                            }
+                            if(value === "未启动"){
+                                return '<span class="badge badge-primary">' + value + '</span>';
+                            }
+                            return '<span class="badge badge-primary">' + value + '</span>';
+                        }
+                    },
                     {title: '审核状态',field: 'auditStatus',
                         formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
                     },