入库部分和接口

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java

@@ -164,7 +164,7 @@ public class ToErpServiceImpl implements IToErpService {
                 for (DeliveryNoticeItemVo item : items) {
                     InStockinDetail detail = new InStockinDetail();
                     detail.setStockinGuid(inStockin.getStockinGuid());
-                    detail.setStockinDetailId(item.getLineNo());
+                    detail.setStockinDetailId(inStockin.getStockinId()+"-"+item.getLineNo());
                     detail.setStockinId(inStockin.getStockinId());
                     detail.setProductId(item.getInventoryCode());
                     detail.setProductName(item.getInventoryName());
@@ -175,6 +175,7 @@ public class ToErpServiceImpl implements IToErpService {
                     detail.setSpare1(item.getLevelRelation());
                     detail.setSpare2(item.getUpperMaterial());
                     detail.setSpare3(item.getTopMaterial());
+                    detail.setSpare6(item.getLineNo());
                     detail.setRemark(item.getRemark());
                     detail.setAssignNum("0");
                     detail.setScanNum("0");
@@ -259,7 +260,7 @@ public class ToErpServiceImpl implements IToErpService {
                 for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) {
                     OutStockoutDetail d = new OutStockoutDetail();
 
-                    d.setStockoutDetailId(item.getLineNo());
+                    d.setStockoutDetailId(out.getStockoutId()+"-"+item.getLineNo());
                     d.setStockoutGuid(out.getStockoutGuid());
                     d.setStockoutId(out.getStockoutId());
                     d.setProductId(item.getInventoryCode());
@@ -270,6 +271,7 @@ public class ToErpServiceImpl implements IToErpService {
                     d.setSpare1(item.getLevelRelation());
                     d.setSpare2(item.getUpperMaterial());
                     d.setSpare3(item.getTopMaterial());
+                    d.setSpare6(item.getLineNo());
                     d.setRemark(item.getRemark());
 
                     try {

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -142,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNum != null">scan_num,</if>
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="productName != null">product_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinDetailId != null">#{stockinDetailId},</if>
@@ -178,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNum != null">#{scanNum},</if>
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="productName != null">#{productName},</if>
          </trim>
     </insert>
     <insert id="insertInStockinDetailList">
@@ -290,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNum != null">scan_num = #{scanNum},</if>
             <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
             <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="productName != null">product_name = #{productName},</if>
         </trim>
         where stockin_detail_id = #{stockinDetailId}
     </update>

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml

@@ -139,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spare3,
                mjd.spare4,
                mjd.pick_quantity,
-               bp.product_name,
+               mjd.product_name,
                mjd.spare5,
                mjd.spare6,
                mjd.spare7,

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mjd.spare4,
         mjd.pick_quantity,
         mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-        bp.product_name,
+        mjd.product_name,
         mjd.spare5,
         mjd.spare6,
         mjd.spare7,

ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml

@@ -104,7 +104,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMydoJobFinishListByMydoJob" parameterType="MydoJob" resultMap="MydoJobFinishResult">
-        <include refid="selectMydoJobFinishVo"/>
+        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+        bw.warehouse_name as warehouse_name
+        from mydo_job_finish mj
+        left join bas_supplier bs on mj.supplier_id = bs.id
+        left join bas_customer bc on mj.customer_id = bc.id
+        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
+
         <where>
             <if test="jobId != null  and jobId != ''"> and mj.job_id = #{jobId}</if>
             <if test="status != null  and status != ''"> and mj.status = #{status}</if>
@@ -134,18 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
-            <if test="productId != null  and productId != ''"> and mj.job_id in (select job_id from mydo_job_detail where product_id like concat('%', #{productId}, '%'))</if>
+            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
-            <if test = "inOutIds !=null and inOutIds.size() > 0">
-                and mj.in_or_out in
-                <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
-        </where>
             order by mj.create_time desc
+        </where>
+
     </select>
 
     <select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -58,7 +58,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
-        <include refid="selectMydoJobVo"/>
+        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+        bw.warehouse_name as warehouse_name
+        from mydo_job mj
+        left join bas_supplier bs on mj.supplier_id = bs.id
+        left join bas_customer bc on mj.customer_id = bc.id
+        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
         <where>
             <if test="jobId != null  and jobId != ''"> and mj.job_id = #{jobId}</if>
             <if test="status != null  and status != ''"> and mj.status = #{status}</if>
@@ -88,16 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
-            <if test="productId != null  and productId != ''"> and mj.job_id in (select job_id from mydo_job_detail where product_id like concat('%', #{productId}, '%'))</if>
+            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
-            <if test = "inOutIds !=null and inOutIds.size() > 0">
-                and mj.in_or_out in
-                <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
         </where>
         order by mj.create_time desc
     </select>

ruoyi-ui/src/views/in/job/index.vue

@@ -153,7 +153,7 @@
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
 <!--      <el-table-column label="巷道" align="left" prop="roadwayId" sortable/>-->
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" sortable/>
+      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
       <el-table-column label="托盘条码" align="left" prop="trayCode" width="140" />
 <!--      <el-table-column label="优先级" align="left" prop="priority" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
@@ -162,11 +162,11 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column label="项目号" align="left" prop="lineId" />
-      <el-table-column label="入口" align="left" prop="entranceId" sortable/>
+      <el-table-column label="入口" align="left" prop="entranceId" />
 <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" />
-      <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/>
+      <el-table-column label="开始时间" align="left" prop="startTime" width="180" />
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/>
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" />
     </el-table>
 
     <pagination