diff --git a/.env.production b/.env.production
index 51a50f6..0fe478f 100644
--- a/.env.production
+++ b/.env.production
@@ -7,15 +7,23 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
-# 文明点
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# 文明东
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 ljy
+# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 wqq
+# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
+
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index a32fa73..031b8d6 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -505,3 +505,11 @@ export function updateOrderDetailBiz(params) {
   });
 }
 
+
+export function orderDetailAdd(params) {
+  return axios({
+    url: "/inv/inner/order/orderDetailAdd",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
new file mode 100644
index 0000000..268cf10
--- /dev/null
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -0,0 +1,546 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" label-width="100px" v-show="showSearch">
+        <el-row style="width: 100%">
+          <el-col :span="8">
+            <el-form-item label="单号:">
+              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
+              <el-select v-model="query.inCodeStatus" style="width: 90%">
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="送货单位:">-->
+          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="query.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="combine">选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                @row-click="getStockOrderDetailList" ref="multipleTable">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="150">
+        </el-table-column>
+        <el-table-column label="单据来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="query.limit"
+        :page.sync="query.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.productDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="失效日期" prop="expireDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="detailHandleCurrentChange"
+      ></pagination>
+    </el-card>
+
+<!--    <el-dialog-->
+<!--      title="内部码管理"-->
+<!--      :visible.sync="qrcodeDetailVisible"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :close-on-press-escape="false"-->
+<!--      width="70%"-->
+<!--      append-to-body-->
+<!--      v-if="qrcodeDetailVisible"-->
+<!--      @close='closeQRCodeDetailDialog'-->
+<!--    >-->
+<!--      <stockOrderQRCodeDetail-->
+<!--        :closeDialog="closeQRCodeDetailDialog"-->
+<!--        :idQuery="idQuery"-->
+<!--      ></stockOrderQRCodeDetail>-->
+<!--    </el-dialog>-->
+
+  </div>
+</template>
+
+<script>
+import {
+  stockorderQuery, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText
+} from "@/api/inout/stockOrder";
+import stockOrderDistribution from "./stockOrderDistribution";
+import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+import stockQRCodeExport from "./stockQRCodeExport";
+import draggable from "vuedraggable";
+import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
+import store from "@/store";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
+import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
+import {convertDate} from "@/utils/date"
+import { filterOrder, orderDetailAdd } from '@/api/inout/order'
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+  name: "stockOrder",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    billNo: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      convertDateFun: convertDate,
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      isSp: store.getters.customerId,
+      storageList: [],
+      subInvList: [],
+      busTypes: [],
+      list: [],
+      orderQuery:[],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      loading: false,
+      detailLoading: false,
+      enableMap: {
+        1: "已打印",
+        0: "未打印",
+      },
+      sourceMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda已校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "单据流转",
+        "7": "供应商平台",
+        "8": "平衡补单",
+        "9": "单据验收直接补单",
+        "10": "单据复制",
+        "11": "盘点单据转单",
+        "12": "申购计划转单",
+        "13": "领用单据转单",
+        "14": "第三方单据转单",
+
+      },
+      idQuery: {
+        id: "",
+        filterUDIType: null,
+      },
+      distributionVisible: false,
+      detailFormRules: {
+        batchNo: [
+          {required: true, message: "请输入批次号", trigger: "blur"}
+        ],
+        productDate: [
+          {required: true, message: "请输入生产日期", trigger: "blur"}
+        ],
+        expireDate: [
+          {required: true, message: "请输入失效日期", trigger: "blur"}
+        ],
+        sweepCount: [
+          {required: true, message: "请输入扫码数量", trigger: "blur"}
+        ]
+      },
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveDistributionVisible: true,
+      qrcodeDetailVisible: false,
+      qrcodeExportVisible: false,
+      filterUDIType: true,
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      };
+      this.getList();
+
+      this.haveDistributionVisible = true;
+      this.actDateRange = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmit() {
+      this.query.page = 1;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.query.startAduditTime = this.auditDateRange[0];
+        this.query.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.query.startAduditTime = null;
+        this.query.endAduditTime = null;
+      }
+      this.getList();
+      this.haveDistributionVisible = true;
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.detailQuery.page = val.page;
+      this.getStockOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.orderQuery=[];
+      this.query.corpId = store.getters.customerId;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+      this.query.vueType = "supDelivery";
+      filterOrder(this.query)
+        .then(response => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = [];
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    combine(){
+      if(this.orderQuery==null && this.orderQuery.length==0){
+        this.$message.error("请先选择单据！")
+        return;
+      }
+      var query={
+        orderIdFk:this.billNo,
+        billNo:this.orderQuery.billNo
+      }
+      orderDetailAdd(query).then(response =>{
+          if (response.code == 20000) {
+            this.closeDialog();
+          }
+      })
+    },
+
+    qrcodeDetail(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.idQuery.filterUDIType = this.filterUDIType;
+        this.qrcodeDetailVisible = true;
+      }
+    },
+    closeQRCodeDetailDialog() {
+      this.qrcodeDetailVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.billNo;
+        this.orderQuery=row;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        vueType: "supDelivery",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      findInvByUser()
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+  },
+  components: {
+    draggable,
+    stockOrderDistribution,
+    stockOrderQRCodeDetail,
+    stockQRCodeExport,
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
+    }
+  },
+  created() {
+    // 加载表格数据
+    this.getSubInvList();
+    this.getBusType();
+    this.getList();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue
index 9d2fc44..86a57ee 100644
--- a/src/views/basic/locUdi/UdiSupplement.vue
+++ b/src/views/basic/locUdi/UdiSupplement.vue
@@ -331,7 +331,7 @@ export default {
       return !row.check;
     },
     handleCurrentChange(val) {
-      this.unionQuery.page = val;
+      this.unionQuery.page = val.page;
       this.getList();
     },
     tableRowClassName({row, rowIndex}) {
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 8b6a791..61e2e77 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -690,7 +690,6 @@ export default {
       }
 
       this.filterQuery.page = 1;
-      this.filterQuery.supInoivceSearch=null;
       this.getList();
     },
     hideSearch() {
@@ -738,7 +737,7 @@ export default {
     getBusType() {
       let query = {
         code: this.filterQuery.invCode,
-        enabled: true,
+        enable: true,
         vueType: "supInvoice",
       };
       getLocalJoinByUser(query)
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 309977f..19469ff 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="送货单号:">
               <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
                         style="width: 90%"
@@ -11,17 +11,8 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <el-option label="全部" value=""></el-option>-->
-          <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-          <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
@@ -37,9 +28,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -56,8 +55,16 @@
           </el-col>
         </el-row>
         <el-row>
-
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="往来单位:">
               <el-select
                 v-model="filterQuery.fromCorp"
@@ -92,7 +99,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -109,7 +116,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -564,6 +571,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       corpLoading: false,
@@ -700,6 +708,7 @@ export default {
         status: null,
         limit: 10,
         startTime: null,
+        sourceLocalType: "1",
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 1398649..6cb3c76 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -41,7 +41,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -58,7 +67,16 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -74,7 +92,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -430,6 +448,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       reviceStatus: {
@@ -561,9 +580,11 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
+
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -603,7 +624,7 @@ export default {
         });
     },
     handleSelectionChange(val) {
-      this.currentRow.billNo=val.billNo;
+      this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 3f93b94..10002cb 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -142,10 +142,10 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-        <!--        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
-        <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index e7ffcd9..d4907e6 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -246,7 +246,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreInProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 2,
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index dae6671..65984a3 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 3, //获取寄售库1：入账，2：预验收，3：寄售
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 166ac7c..51a311b 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -273,7 +273,7 @@ export default {
 
     getOrderQRCodeTextList() {
       this.loading = true;
-      filterPrint({sOrderId :this.query.orderIdFk}) //查找该单号下的所有条码
+      filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码
         .then((response) => {
           console.log(response)
           this.codeArray = response.data.list || [];
@@ -378,7 +378,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.loading = true;
-        generateInnerQRCodeText({orderIdFk: this.formData.id})
+        generateInnerQRCodeText({orderIdFk: this.formData.recordKey})
           .then(response => {
             this.loading = false;
             if (response.code === 20000) {
@@ -427,8 +427,9 @@ export default {
     if (this.$isNotBlank(this.inQuery.id)) {
       this.formData = this.inQuery.formData;
       this.query.orderId = this.inQuery.id;
-      this.query.orderIdFk = this.formData.id;
+      this.query.orderIdFk = this.formData.recordKey;
       this.query.sOrderId = this.inQuery.id;
+      console.log(this.query)
       this.getOrderQRCodeTextList();
     }
   },
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index e080ee3..c0a3a41 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -45,8 +45,8 @@
         <el-table-column label="备注说明" prop="remark"></el-table-column>
         <el-table-column label="打印状态" prop="printStatus">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusPrintMap[scope.row.status] }}
+            <el-tag :type="(scope.row.genStatus) | statusFilterType">
+              {{ statusPrintMap[scope.row.genStatus] }}
             </el-tag>
           </template>
         </el-table-column>
@@ -239,7 +239,7 @@ export default {
         });
     },
     handleDetail(row) {
-      let query = {orderIdFk: row.id};
+      let query = {orderIdFk: row.recordKey};
       this.loading = true;
       listInnerOrderDetail(query) //查找该单号下的所有条码
         .then((response) => {
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index d1fa892..b4b6dab 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -108,6 +108,7 @@
                 :closeDialog="closeDialogC2"
                 :data="thisData"
                 :pId="pId"
+                :billNo="billNo"
                 :filterType="2"
             ></stockOrderNewSelectProduct>
         </el-dialog>
@@ -123,6 +124,11 @@
         :append-to-body='true'
       >
         <stockOrder
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :pId="pId"
+          :billNo="billNo"
+          :filterType="2"
         ></stockOrder>
       </el-dialog>
     </div>
@@ -131,7 +137,7 @@
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
-import stockOrder from "@/views/basic/business/stockOrder";
+import stockOrder from "@/views/basic/business/stockOrderPrint";
 import {
   inserThrOrderWeb,
   delInnerOrderDetail,
@@ -173,6 +179,7 @@ export default {
             codeArray: [],
             total: 0,
             pId:null,
+            billNo:null,
             loading: false,
             index: null,
             formLoading: false,
@@ -278,6 +285,24 @@ export default {
           this.selectedIndex = "";
         },
       stockOrderList(){
+        if(this.query.id==null) {
+          inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
+            .then(response => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.pId=response.data.id;
+                this.billNo=response.data.recordKey;
+                this.formData.billNo=response.data.recordKey;
+                this.formData.id=this.pId
+              } else {
+
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            })
+        }
+
         this.haveDistributionVisible = true;
       },
         selectProductFunction() {
@@ -286,7 +311,9 @@ export default {
               .then(response => {
                 this.loading = false;
                 if (response.code === 20000) {
-                  this.pId=response.data;
+                  this.pId=response.data.id;
+                  this.billNo=response.data.recordKey;
+                  this.formData.billNo=response.data.recordKey;
                   this.formData.id=this.pId
                 } else {
 
@@ -301,6 +328,7 @@ export default {
         },
         closeDialogC2(rData) {
             this.selectProductVisible = false;
+            this.haveDistributionVisible = false;
             this.getStockOrderDetailList();
         },
         rowChange(val) {
@@ -366,7 +394,7 @@ export default {
         },
         getStockOrderDetailList() {
             this.loading = true;
-            listInnerOrderDetail({orderIdFk:this.formData.id}) //查找该单号下的所有条码
+            listInnerOrderDetail({orderIdFk:this.formData.billNo}) //查找该单号下的所有条码
                 .then((response) => {
                     this.codeArray = response.data.list || [];
                     this.total = response.data.total || 0;
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 6e15052..7889a78 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -148,6 +148,10 @@ export default {
       type: Object,
       required: true,
     },
+    billNo: {
+      type: Object,
+      required: true,
+    },
   },
 
   data() {
@@ -335,7 +339,7 @@ export default {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
         count: 1,
-        orderIdFk: this.pId,
+        orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index eeb977d..6ad7fd8 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -19,8 +19,8 @@
         <el-form-item label="仓库类型" prop="advanceType">
           <el-select v-model="subData.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
-            <el-option label="寄售库" :value="2"/>
-            <el-option label="预验收库" :value="3"/>
+            <el-option label="预验收库" :value="2"/>
+            <el-option label="寄售库" :value="3"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -200,8 +200,8 @@
                 <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
                            style="width: 80%">
                   <el-option label="入账库" value="1"/>
-                  <el-option label="寄售库" value="2"/>
-                  <el-option label="预验收库" value="3"/>
+                  <el-option label="预验收库" value="2"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index a0030e9..227b1b9 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -55,7 +55,13 @@
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="说明" prop="intro"></el-table-column>
+        <el-table-column label="创建单据模式" prop="createType">
+
+          <template slot-scope="scope">
+            <span>{{ createTypeMap[scope.row.createType] }}</span>
+          </template>
+
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -137,11 +143,12 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
       },
       enableMap: {
         true: "全量补单",
@@ -153,6 +160,14 @@ export default {
         2: "待审核",
         3: "已审核"
       },
+
+      createTypeMap: {
+        1: "送货至入库补单",
+        2: "向上级仓库补单",
+        3: "预验收转入库补单",
+        4: "寄售转入库补单",
+      },
+
       total: 0,
       loading: false,
       formMap: {
@@ -273,11 +288,13 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
+
       };
       this.modifyDialogVisible = true;
     },
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 72fc7f0..e19e04f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -97,7 +97,8 @@
                        style="width: 90%">
               <el-option label="送货至入库补单" :value="1"></el-option>
               <el-option label="向上级仓库补单" :value="2"></el-option>
-              <el-option label="寄售/预验收转入库补单" :value="3"></el-option>
+              <el-option label="预验收转入库补单" :value="3"></el-option>
+              <el-option label="寄售转入库补单" :value="4"></el-option>
             </el-select>
           </el-form-item>
         </el-col>