物料

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -466,12 +466,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 updateMydoJob(job);
                 insertHistory(jobId);
                 //通知wcs
-                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-                if (ajaxResult.isSuccess()){
-                    return AjaxResult.success();
-                }else {
-                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
-                }
+//                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+//                if (ajaxResult.isSuccess()){
+//                    return AjaxResult.success();
+//                }else {
+//                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
+//                }
             }
 
         } catch (Exception e) {

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -90,11 +90,21 @@ public class OutStockout extends BaseEntity
     private String productId;
 
     private String productName;
+    private String supplierName;
 
     private String remark;
 
     private List<String> typeData;
 
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">lot_no,</if>
             <if test="productGuid != null">product_guid,</if>
             <if test="productId != null">product_id,</if>
-            <if test="productName != null">product_name,</if>
+
             <if test="quantity != null">quantity,</if>
             <if test="quantityX != null">quantity_x,</if>
             <if test="quantityJ != null">quantity_j,</if>
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lotNo != null">#{lotNo},</if>
             <if test="productGuid != null">#{productGuid},</if>
             <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
+
             <if test="quantity != null">#{quantity},</if>
             <if test="quantityX != null">#{quantityX},</if>
             <if test="quantityJ != null">#{quantityJ},</if>

ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml

@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult">
         select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.reamrk  from out_stockout_finish o
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.remark  from out_stockout_finish o
         left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
         left join bas_customer bc on bc.customer_no = o.customer_no
         left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="finishDate"    column="finish_date"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="supplierName"    column="supplier_name"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
@@ -33,10 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
         select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.remark  from out_stockout o
-        left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
-         left join bas_customer bc on bc.customer_no = o.customer_no
+         o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark  from out_stockout o
         left join out_stockout_detail d on d.stockout_id = o.stockout_id
+        left join bas_customer bc on bc.customer_no = d.out_id
+        left join bas_warehouse bw on bw.warehouse_id = d.warehouse_id
+        left join bas_supplier bs on bs.supplier_no = d.supplier_id
+        left join bas_product bp on bp.product_id = d.product_id
 
         <where>
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
@@ -49,15 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createManId != null  and createManId != ''"> and o.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and o.status = #{status}</if>
             <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source = #{stockoutSource}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id = #{warehouseId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and d.warehouse_id = #{warehouseId}</if>
             <if test="classNowId != null  and classNowId != ''"> and o.class_now_id = #{classNowId}</if>
             <if test="exitId != null  and exitId != ''"> and o.exit_id = #{exitId}</if>
             <if test="carNumber != null  and carNumber != ''"> and o.car_number = #{carNumber}</if>
             <if test="FID != null  and FID != ''"> and o.FID = #{FID}</if>
             <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id = #{erpStockoutId}</if>
             <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
-            <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
+            <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="supplierName != null  and supplierName != ''"> and bs.supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="remark != null  and remark != ''"> and o.remark like concat('%', #{remark}, '%')</if>
         </where>
         order by o.create_date desc

ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml

@@ -89,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bp.remark,         --备注
                bs.stock_id,       --库存编码
                bs.stock_status,   --库存状态
-               bs.lot_no          --批次号
+               bs.lot_no,          --批次号
+               bs.out_quantity
         from bas_stock bs
                  left join bas_product bp on bs.product_id = bp.product_id
                  left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id