中继服务，第三方接口，批次号校验

public/config.json

@@ -1,6 +1,6 @@
 {
     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://192.168.0.109:9991/",
+    "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
-    "SERVER_IP": "http://192.168.0.109:9991/",
+    "SERVER_IP": "http://139.9.178.73:8080/",
     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }

src/api/basic/basicThirdSys.js

@@ -43,3 +43,24 @@ export function updateDetailBasicThirdSys(query) {
 }
 
 
+export function filterBusTypeDetail(query) {
+    return axios({
+        url: "/udiwms/basic/thirdsys/filterBusTypeDetail",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function saveBusTypeDetail(query) {
+    return axios({
+        url: "/udiwms/basic/thirdsys/saveBusTypeDetail",
+        method: "post",
+        data: query
+    });
+}
+
+
+
+
+

src/api/basic/busOriginType.js

@@ -22,3 +22,11 @@ export function insertBussinessType(query) {
         data: query
     });
 }
+
+export function downloadBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/download",
+        method: "post",
+        data: query
+    });
+}

src/views/basic/BasicThirdSys.vue

@@ -83,8 +83,8 @@
 
         </el-card>
         <el-card class="el-card">
-
+            <el-table v-loading="loading" :data="detailList" style="width: 100%"
-            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                      @current-change="handleBustypeChange">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="接口名称" prop="name" show-overflow-tooltip="true"></el-table-column>
 
@@ -148,9 +148,49 @@
             ></el-pagination>
 
 
+        </el-card>
+
+        <el-card class="el-card">
+
+            <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
+                <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据类型代码" prop="code">
+                </el-table-column>
+
+                <el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip>
+
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.url"
+                                  placeholder="请输入"></el-input>
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
+
+
+                <el-table-column label="操作" width="150" prop="price" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleEdit(scope.$index, scope.row)"
+                        >编辑
+                        </el-button>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="handleSave(scope.$index, scope.row)"
+                        >保存
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
             <div style="margin-top: 18px ;  color: #F71616;">
                 <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
             </div>
+
         </el-card>
 
     </div>
@@ -158,7 +198,7 @@
 <script>
 import {
     getBasicThirdSys,
-        updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys
+    updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys, filterBusTypeDetail, saveBusTypeDetail
 } from "../../api/basic/basicThirdSys";
 
 import modifyDialog from "./BasicThirdSysModify";
@@ -176,9 +216,11 @@
             },
             modifyDialogVisible: false,
             modifyDetailDialogVisible: false,
+            modifyBusYypeDialogVisible: false,
             list: [],
             inputQuery: null,
             inputDetailQuery: null,
+            inputBusTypeQuery: null,
             enableMap: {
                 true: "是",
                 false: "否",
@@ -190,7 +232,11 @@
                 3: "接口本地缓存"
             },
             detailList: null,
+            busTypeList: [],
             total: 0,
+            loading: false,
+            busTypeLoading:false,
+            currentCheckIndex: -1,
         };
     },
 
@@ -211,10 +257,14 @@
         cancelDialog() {
             this.modifyDialogVisible = false;
             this.modifyDetailDialogVisible = false;
+            this.modifyBusYypeDialogVisible = false;
         },
         handleCurrentChange(row) {
             this.getDetailList(row);
         },
+        handleBustypeChange(row) {
+            this.getBustyList(row);
+        },
         getList() {
             this.loading = true;
             getBasicThirdSys(this.filterQuery)
@@ -253,6 +303,31 @@
                 });
         },
 
+        getBustyList(row) {
+            let query = {
+                thirdSysFk: row.thirdSysFk,
+                type: 0,
+            };
+            if (row.key == "orderQueryUrl") {
+                query.type = 1;
+            } else if (row.key == "orderSubmitUrl") {
+                query.type = 2;
+            } else {
+                this.busTypeList = [];
+                return;
+            }
+            this.busTypeLoading = true;
+            filterBusTypeDetail(query)
+                .then((response) => {
+                    this.busTypeLoading = false;
+                    this.busTypeList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.busTypeLoading = false;
+                    this.busTypeList = [];
+                });
+        },
+
 
         onModifySubmit() {
             updateBasicThirdSys(this.inputQuery)
@@ -300,6 +375,20 @@
             this.modifyDetailDialogVisible = true;
             this.inputDetailQuery = row;
         },
+
+
+
+        handleEdit(index, row) {
+            this.currentCheckIndex = index;
+        },
+        handleSave(index, row) {
+            this.currentCheckIndex = -1;
+            saveBusTypeDetail(row).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success(res.data);
+                }
+            })
+        },
     },
     components: {
         modifyDialog, modifyDetailDialog

src/views/basic/BussinessTypeThird.vue

@@ -18,10 +18,24 @@
         <!--                    <el-option label="未启用" value="0"></el-option>-->
         <!--                </el-select>-->
         <!--            </el-form-item>-->
+
+        <el-form-item class="query-form-item">
+          <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
+            <el-option
+                v-for="item in thirdSys"
+                :key="item.value"
+                :label="item.thirdName"
+                :value="item.thirdId">
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
             <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="updateDownload">更新下载</el-button>
             <!--                    <el-upload-->
             <!--                        :action="uploadFileUrl"-->
             <!--                        multiple-->
@@ -49,7 +63,7 @@
         <!--                    <span>{{ enableMap[scope.row.enable] }}</span>-->
         <!--                </template>-->
         <!--            </el-table-column>-->
-                <el-table-column label="第三方系统" prop="thirdSysName" ></el-table-column>
+        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -118,11 +132,12 @@
 import {
   getOriginBusType,
   updateBussinessType,
-    insertBussinessType,
+  insertBussinessType, downloadBussinessType
 } from "../../api/basic/busOriginType";
 
 import modifyDialog from "./BussinessTypeThirdModify";
 import axios from "axios";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 
 export default {
   data() {
@@ -148,10 +163,11 @@ export default {
         true: "是",
         false: "否",
       },
-
+      thirdSys: [],
       total: 0,
       multipleSelection: [],
       uploadFileUrl: null,
+      loading: false,
     };
   },
 
@@ -161,6 +177,7 @@ export default {
         path: "",
       });
       this.filterQuery = {
+        thirdSys: "thirdId",
         name: null,
         enable: null,
         page: 1,
@@ -187,6 +204,33 @@ export default {
             this.total = 0;
           });
     },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+            this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+    },
+    updateDownload() {
+      let query = {
+        thirdSys: this.filterQuery.thirdSys,
+      }
+      downloadBussinessType(query)
+          .then((response) => {
+            this.loading = false;
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
     handleCurrentChange(val) {
       this.filterQuery.page = val;
       this.getList();
@@ -244,23 +288,10 @@ export default {
           });
     },
 
-        deleteOrders(data) {
+    thirdSysChange() {
-            this.loading = true;
+      this.getList();
-            let tquery = {
-                id: data.id + "",
-            };
-
-            // deleteBussinessType(tquery)
-            //     .then((response) => {
-            //         this.getList();
-            //         this.$message({
-            //             type: "success",
-            //             message: "删除成功！",
-            //         });
-            //     })
-            //     .catch(() => {
-            //     });
     },
+
     init() {
       axios.get("./config.json").then(res => {
         // 基础地址
@@ -286,6 +317,7 @@ export default {
   },
   created() {
     this.init();
+    this.getBasicThirdSys();
     this.getList();
 
   },

src/views/basic/UdiInfoManage.vue

@@ -158,7 +158,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="scope.row.thirdId == null || scope.row.thirdId == '' || scope.row.flbm!=null"
+                            :disabled="scope.row.originUuid != null"
                             @click.native.stop="intentSelectUdi(scope.row)"
                         >关联DI
                         </el-button>
@@ -697,39 +697,24 @@
                     </el-row>
 
                     <el-row :gutter="20" class="el-row" type="flex">
-                        <el-col :span="10" class="el-col">
+                        <el-col :span="24" class="el-col">
-                        </el-col>
+                            <div style="margin-top: 18px;margin-bottom: 18px">
-                        <el-col :span="4" class="el-col">
+                                <el-checkbox v-model="checked" class=""
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="checked" class="text item itemTag"
                                              :disabled="!isUseDyCheck"
                                 >以使用单元数量入库
                                 </el-checkbox>
-                            </el-form-item>
+                                <el-checkbox v-model="editQuery.isDisable" class=""
-                        </el-col>
-                        <!--                    <el-col :span="3" class="el-col">-->
-                        <!--                        <el-form-item prop="name">-->
-                        <!--                            <el-checkbox v-model="editQuery.isLock" class="text item itemTag"-->
-                        <!--                            >是否锁定-->
-                        <!--                            </el-checkbox>-->
-                        <!--                        </el-form-item>-->
-                        <!--                    </el-col>-->
-                        <el-col :span="3" class="el-col">
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="editQuery.isDisable" class="text item itemTag"
                                              @change="diableChange"
                                 >是否禁用
                                 </el-checkbox>
-                            </el-form-item>
+                                <el-checkbox v-model="editQuery.isAdavence" class=""
-                        </el-col>
-                        <el-col :span="3" class="el-col">
-                            <el-form-item prop="name">
-                                <el-checkbox v-model="editQuery.isAdavence" class="text item itemTag"
                                 >是否寄售
                                 </el-checkbox>
-                            </el-form-item>
+                                <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                                >是否允许无批次号扫码
+                                </el-checkbox>
+                            </div>
                         </el-col>
-
                     </el-row>
                 </el-form>
 
@@ -859,6 +844,7 @@ export default {
                 isUseDy: false,
                 isLock: null,
                 isAdavence: null,
+                allowNoBatch:null,
             },
             defaultSys: null,
             isImport: false,

src/views/business/stockOrderEditDistribution.vue

@@ -576,8 +576,10 @@ export default {
                     } else {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
+                                if (!this.codeArray[i].allowNoBatch) {
                                     return this.$message.error('批次号不能为空');
                                 }
+                            }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }

src/views/business/stockOrderNewDistribution.vue

@@ -644,8 +644,10 @@ export default {
                                 return this.$message.error('单据数量不能为0');
                             }
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
+                              if (!this.codeArray[i].allowNoBatch) {
                                 return this.$message.error('批次号不能为空');
                               }
+                            }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }

src/views/inout/DialogSelectRl.vue

@@ -451,29 +451,21 @@
 
 
                 <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
+                    <el-col :span="24" class="el-col">
-                    </el-col>
+                        <div style="margin-top: 18px;margin-bottom: 18px">
-                    <el-col :span="4" class="el-col">
+                            <el-checkbox v-model="checked"
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="checked" class="text item itemTag"
-                                         :disabled="!isUseDyCheck"
                             >以使用单元数量入库
                             </el-checkbox>
-                        </el-form-item>
+                            <el-checkbox v-model="editQuery.isDisable"
-                    </el-col>
-                    <el-col :span="3" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="editQuery.isLock" class="text item itemTag" :disabled="true"
-                            >是否锁定
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3" class="el-col">
-                        <el-form-item prop="name">
-                            <el-checkbox v-model="editQuery.isDisable" class="text item itemTag" :disabled="true"
                             >是否禁用
                             </el-checkbox>
-                        </el-form-item>
+                            <el-checkbox v-model="editQuery.isAdavence"
+                            >是否寄售
+                            </el-checkbox>
+                            <el-checkbox v-model="editQuery.allowNoBatch"
+                            >是否允许无批次号扫码
+                            </el-checkbox>
+                        </div>
                     </el-col>
 
                 </el-row>

src/views/inout/IOAddOrder.vue

@@ -911,6 +911,7 @@ export default {
             event.stopPropagation();
         };
         var that = this;
+        let sictomText = "";
         var inputer = document.getElementById("inputer");
         window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
         sc.onInput = function (text) {
@@ -920,7 +921,8 @@ export default {
                 return;
             }
             if (that.sitcomScan) {
-                that.formData.code = that.formData.code;
+                sictomText = sictomText+text;
+                that.formData.code = sictomText;
             } else {
                 that.formData.code = text;
             }

src/views/inout/IOCheckWaitOrder.vue

@@ -557,6 +557,7 @@ export default {
             });
             let tquery = {
                 orderList: orderList,
+                type: 1,
             };
 
             this.$confirm(

src/views/inout/IONewOrder.vue

@@ -566,6 +566,7 @@ export default {
             });
             let tquery = {
                 orderList: orderList,
+                type: 2,
             };
 
             this.$confirm(