生产领料，执行出库

doc/设计文档/数据库设计/mes-wm.sql

@@ -323,6 +323,7 @@ create table wm_issue_header (
   issue_name            varchar(255)    not null                    comment '领料单名称',
   workstation_id        bigint(20)                                  comment '工作站ID',
   workstation_code      varchar(64)                                 comment '工作站编号',    
+  workstation_name      varchar(255)                                comment '工作站名称',
   workorder_id          bigint(20)                                  comment '生产工单ID',
   workorder_code        varchar(64)                                 comment '生产工单编码',
   task_id               bigint(20)                                  comment '生产任务ID',

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueHeader.java

@@ -36,6 +36,8 @@ public class WmIssueHeader extends BaseEntity
     @Excel(name = "工作站编号")
     private String workstationCode;
 
+    private String workstationName;
+
     /** 生产工单ID */
     @Excel(name = "生产工单ID")
     private Long workorderId;

ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="issueName"    column="issue_name"    />
         <result property="workstationId"    column="workstation_id"    />
         <result property="workstationCode"    column="workstation_code"    />
+        <result property="workstationName"    column="workstation_name"    />
         <result property="workorderId"    column="workorder_id"    />
         <result property="workorderCode"    column="workorder_code"    />
         <result property="taskId"    column="task_id"    />
@@ -79,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issueName != null  and issueName != ''"> and issue_name like concat('%', #{issueName}, '%')</if>
             <if test="workstationId != null "> and workstation_id = #{workstationId}</if>
             <if test="workstationCode != null  and workstationCode != ''"> and workstation_code = #{workstationCode}</if>
+            <if test="workstationName != null  and workstationName != ''"> and workstation_name = #{workstationName}</if>
             <if test="workorderId != null "> and workorder_id = #{workorderId}</if>
             <if test="workorderCode != null  and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
             <if test="taskId != null "> and task_id = #{taskId}</if>
@@ -110,8 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getTxBeans" parameterType="Long" resultMap="IssueTxBeanResult">
         SELECT irl.material_stock_id, irl.`item_id`,irl.`item_code`,irl.`item_name`,irl.`specification`,irl.`unit_of_measure`,irl.`batch_code`,
                irl.`warehouse_id`,irl.`warehouse_code`,irl.`warehouse_name`,irl.`location_id`,irl.`location_code`,irl.`location_name`,irl.`area_id`,irl.`area_code`,irl.`area_name`,
-               'IR' AS source_doc_type,ir.`recpt_id` AS source_doc_id,ir.`recpt_code` AS source_doc_code,irl.`line_id` AS source_doc_line_id,
+               'ISSUE' AS source_doc_type,ir.`issue_id` AS source_doc_id,ir.`issue_code` AS source_doc_code,irl.`line_id` AS source_doc_line_id,
-               irl.`quantity_issued` AS transaction_quantity,irl.`expire_date`,
+               irl.`quantity_issued` AS transaction_quantity,
                ir.`create_by`,ir.`create_time`,ir.`update_by`,ir.`update_time`
         FROM wm_issue_header ir
                  LEFT JOIN wm_issue_line irl
@@ -126,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issueName != null and issueName != ''">issue_name,</if>
             <if test="workstationId != null">workstation_id,</if>
             <if test="workstationCode != null">workstation_code,</if>
+            <if test="workstationName != null  and workstationName != ''">workstation_name,</if>
             <if test="workorderId != null">workorder_id,</if>
             <if test="workorderCode != null">workorder_code,</if>
             <if test="taskId != null">task_id,</if>
@@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issueName != null and issueName != ''">#{issueName},</if>
             <if test="workstationId != null">#{workstationId},</if>
             <if test="workstationCode != null">#{workstationCode},</if>
+            <if test="workstationName != null  and workstationName != ''">#{workstationName},</if>
             <if test="workorderId != null">#{workorderId},</if>
             <if test="workorderCode != null">#{workorderCode},</if>
             <if test="taskId != null">#{taskId},</if>
@@ -190,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issueName != null and issueName != ''">issue_name = #{issueName},</if>
             <if test="workstationId != null">workstation_id = #{workstationId},</if>
             <if test="workstationCode != null">workstation_code = #{workstationCode},</if>
+            <if test="workstationName != null  and workstationName != ''">workstation_name = #{workstationName},</if>
             <if test="workorderId != null">workorder_id = #{workorderId},</if>
             <if test="workorderCode != null">workorder_code = #{workorderCode},</if>
             <if test="taskId != null">task_id = #{taskId},</if>