mes 出库单据 入库单据回传功能

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java

@@ -183,7 +183,15 @@ public class OutStockoutDetail
     private String isUsed;
     private String supplierName;
     private String customerName;
+    private String swStatus;
 
+    public String getSwStatus() {
+        return swStatus;
+    }
+
+    public void setSwStatus(String swStatus) {
+        this.swStatus = swStatus;
+    }
 
     public String getParentId() {
         return parentId;

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

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isUsed"    column="is_used"    />
         <result property="supplierName"    column="supplier_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="swStatus"    column="sw_status"    />
     </resultMap>
 
     <sql id="selectOutStockoutDetailFinishVo">
@@ -262,16 +263,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.print_date,
+               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.print_date,
                d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
                p.product_name,p.parent_id,p.price as product_price,p.cargo_no as product_draw_no,p.unit as product_unit,p.spec as product_spec,
                p.spare1 as product_status,p.spare3 as create_time,p.spare4 as create_sys,p.spare7 as is_used,
                s.supplier_name,
-               c.customer_name
+               c.customer_name,mbc.status as sw_status
         from out_stockout_detail_finish d
-            left join bas_product p on d.product_id = p.product_id
+                 left join bas_product p on d.product_id = p.product_id
-            left join bas_supplier s on d.supplier_id = s.supplier_no
+                 left join bas_supplier s on d.supplier_id = s.supplier_no
-            left join bas_customer c on d.out_id = c.customer_no
+                 left join bas_customer c on d.out_id = c.customer_no
-        where stockout_guid = #{stockoutGuid}
+                 left join mes_bill_callback mbc on d.stockout_detail_id = mbc.in_stockin_detail_id
+        where d.stockout_guid = #{stockoutGuid}
     </select>
 </mapper>

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

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isUsed"    column="is_used"    />
         <result property="supplierName"    column="supplier_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="swStatus"    column="sw_status"    />
 
     </resultMap>
 
@@ -271,11 +272,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                p.product_name,p.parent_id,p.price as product_price,p.cargo_no as product_draw_no,p.unit as product_unit,p.spec as product_spec,
                p.spare1 as product_status,p.spare3 as create_time,p.spare4 as create_sys,p.spare7 as is_used,
                s.supplier_name,
-               c.customer_name
+               c.customer_name,mbc.status as sw_status
                from out_stockout_detail d
                left join bas_product p on d.product_id = p.product_id
                left join bas_supplier s on d.supplier_id = s.supplier_no
                left join bas_customer c on d.out_id = c.customer_no
+               left join mes_bill_callback mbc on d.stockout_detail_id = mbc.in_stockin_detail_id
         where d.stockout_guid = #{stockoutGuid}
     </select>
 </mapper>

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

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
+      <el-form-item label="入库单据" prop="stockinGuid"><!--入库订单ID-->
         <el-input
-          v-model="queryParams.erpBill"
+          v-model="queryParams.stockinGuid"
-          placeholder="请输入订单号"
+          placeholder="请输入入库单据编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -38,39 +38,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
-        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" >
-          <el-option
-            v-for="dict in dict.type.bill_resource"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <el-select-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请选择仓库"-->
-<!--          clearable-->
-<!--          @change="handleQuery"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商编码" prop="supplierNo">&lt;!&ndash;供应商编码&ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.supplierNo"-->
-<!--          placeholder="请输入供应商编码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!--搜索-->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!--重置-->
@@ -115,17 +82,6 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-
-<!--        <el-button
-          type="info"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="detailSingle"
-          @click="bindTrayCode"
-          v-hasPermi="['in:stockIn:barcodePrinting']"
-        >绑定托盘
-        </el-button>-->
         <el-button
           type="info"
           plain
@@ -282,24 +238,13 @@
 </template>
 
 <script>
-import {
+import {confirmationStockIn, invalidatedStockIn, listStockIn, reviewStockIn} from "@/api/in/stockIn"
-  listStockIn,
+import {listStockInDetail} from "@/api/in/stockInDetail"
-  getStockIn,
-  delStockIn,
-  addStockIn,
-  updateStockIn,
-  invalidatedStockIn,
-  reviewStockIn,
-  confirmationStockIn
-} from "@/api/in/stockIn"
-import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail"
-import {getLodop} from "@/plugins/LodopFuncs.js"
 import {listWarehouse} from "@/api/bas/warehouse";
 import vueEasyPrint from 'vue-easy-print'
 import VueQr from 'vue-qr'
 
 
-
 export default {
   name: "StockIn",
   dicts: ['bill_resource','product_type', 'in_bill_status', 'in_bill_type','bill_resource','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type'],

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -46,35 +46,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'供应商名称'" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          :placeholder="'请输入供应商名称'"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="'仓库名称'" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" :placeholder="'请选择仓库'">
-          <el-option
-            v-for="dict in dict.type.warehouse"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="'创建时间'" prop="dateRange">
-        <el-date-picker
-          v-model="dateRange"
-          type="datetimerange"
-          range-separator="---"
-          :start-placeholder="'起始时间'"
-          :end-placeholder="'结束时间'"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :default-time="['00:00:00', '23:59:59']"
-        />
-      </el-form-item>
 <!--      <el-form-item :label="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
 <!--        <el-select-->
 <!--          v-model="queryParams.warehouseId"-->
@@ -212,6 +183,11 @@
       <el-table-column label="计划数量" align="center" prop="quantity" /> <!-- 计划数量 -->
       <el-table-column label="分配数量" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
       <el-table-column label="实际数量" align="center" prop="assignNum" /> <!-- 实际数量 -->
+      <el-table-column label="回传状态" align="center" prop="swStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sw_status" :value="scope.row.swStatus"/>
+        </template>
+      </el-table-column>
 <!--      <el-table-column :label="'入库单价'" align="center" prop="price"/>-->
 <!--      <el-table-column :label="'来源'" align="center" prop="unit">
         <template slot-scope="scope">
@@ -414,7 +390,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
-  dicts: ['bill_resource','out_bill_type', 'out_bill_status', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
+  dicts: ['bill_resource','sw_status','out_bill_type', 'out_bill_status', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
   data() {
     return {
       // 遮罩层