11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -447,7 +447,9 @@ import {
   getPurchaseOrderInfo,
   addGoodOrder,
   updateGoodOrder,
-  checkGoodOrderById
+  checkGoodOrderById,
+  getGoodOrderCountList,
+  ModefySupplyWarehousing
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -526,6 +528,7 @@ export default {
       showTwo: false,
       warese_out_id: 0,
       return_remark: "",
+      is_warehouse:0
     };
   },
   methods: {
@@ -630,11 +633,7 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =
-              goodList[i].good_name +
-              " " +
-              goodList[i].specification_name +
-              " " +
+            goodList[i].supply_name =goodList[i].good_name +" " +goodList[i].specification_name + " " +
               goodList[i].manufacturer;
             goodList[i].supply_type = goodList[i].good_type_id;
             goodList[i].supply_specification_name =
@@ -947,17 +946,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          addGoodOrder(
-            params,
-            this.supplier_name,
-            start,
-            this.arrearage,
-            this.payment,
-            warehousing_id,
-            this.number,
-            this.rate_of_concession,
-            this.discount_amount
-          ).then((response) => {
+          addGoodOrder( params,this.supplier_name,start,this.arrearage,this.payment, warehousing_id,this.number,this.rate_of_concession,this.discount_amount).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;
               this.$message.success("保存成功!");
@@ -973,6 +962,7 @@ export default {
               this.arrearage = warehouseOut.arrearage;
               this.supplier_name = warehouseOut.supplier_id;
               this.return_remake = warehouseOut.return_remake;
+              this.warehousing_id  = warehouseOut.warehousing_id
               this.start_time = this.getTimes(warehouseOut.document_date);
               for (let i = 0; i < orderInfo.length; i++) {
                 orderInfo[i].supply_count = orderInfo[i].count;
@@ -1038,7 +1028,6 @@ export default {
         this.loading = false;
         return false;
       }
-      console.log("表哥2323233232", this.recordInfo.tableList);
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         this.recordInfo.tableList[i].supply_count = parseInt(
           this.recordInfo.tableList[i].supply_count
@@ -1076,8 +1065,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remake,
           };
-          console.log("sotckind23232232323232323232", params);
-
+         
           updateGoodOrder(
             params,
             this.supplier_name,
@@ -1098,14 +1086,121 @@ export default {
         }
       });
     },
-    checkGoodOrder(){
-      checkGoodOrderById(this.warese_out_id).then(response=>{
-         if(response.data.state == 1){
-           var out = response.data.data.out
-           this.$message.success("审核成功!")
-         }
-      })
-    }
+    checkGoodOrder() {
+      var id = this.warese_out_id;
+      var warehousing_id = this.warehousing_id;
+      console.log("hhh2323232323232323",id,warehousing_id)
+      getGoodOrderCountList(id, warehousing_id).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("审核成功!");
+          this.is_check = 1
+          this.showOne = false;
+          this.showTwo = true;
+          this.showThree = true;
+          var purcaseOrder = response.data.data.purcaseOrder;
+          console.log("采购订单", purcaseOrder);
+
+          var goodOrder = response.data.data.goodOrder;
+          console.log("采购单", goodOrder);
+          var drugList = response.data.data.drugList;
+          console.log("druglist23323223", drugList);
+          var is_warehouse = 0;
+          for (let i = 0; i < purcaseOrder.length; i++) {
+            for (let j = 0; j < drugList.length; j++) {
+              if (purcaseOrder[i].is_source == 1) {
+                if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
+                  purcaseOrder[i].count =
+                    purcaseOrder[i].count * drugList[j].min_number;
+                }
+              }
+            }
+          }
+
+          for (let i = 0; i < goodOrder.length; i++) {
+            for (let j = 0; j < drugList.length; j++) {
+              if (goodOrder[i].is_source == 1) {
+                if (goodOrder[i].supply_unit == drugList[j].max_unit) {
+                  goodOrder[i].count =
+                    goodOrder[i].count * drugList[j].min_number;
+                }
+              }
+            }
+          }
+
+          let objInfo = {};
+          if (goodOrder.length > 0) {
+            goodOrder.forEach((item, index) => {
+              let { project_id } = item;
+              if (!objInfo[project_id]) {
+                objInfo[project_id] = {
+                  project_id,
+                  child: [],
+                  count: 0,
+                };
+              }
+            });
+            let newArr = Object.values(objInfo);
+
+            for (let i = 0; i < goodOrder.length; i++) {
+              for (let j = 0; j < newArr.length; j++) {
+                if (goodOrder[i].project_id == newArr[j].project_id) {
+                  newArr[j].child.push(goodOrder[i]);
+                }
+              }
+            }
+            console.log("newAr2332232323", newArr);
+
+            for (let i = 0; i < newArr.length; i++) {
+              for (let j = 0; j < newArr[i].child.length; j++) {
+                newArr[i].count += newArr[i].child[j].count;
+              }
+            }
+
+            var arr = [];
+            var total = 0;
+            var str = "";
+
+            //如果采购单有数据，则需要比较数量
+            if (newArr.length > 0) {
+              for (let i = 0; i < purcaseOrder.length; i++) {
+                for (let j = 0; j < newArr.length; j++) {
+                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
+                    if (purcaseOrder[i].count > newArr[j].count) {
+                      arr.push(purcaseOrder[i].project_id);
+                    }
+                  }
+                }
+              }
+              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
+
+              if (arr.length == 0) {
+                this.is_warehouse = 1;
+                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+              }
+
+              //部分入库
+              if (total != goodOrder.length) {
+                //修改订购单
+                this.is_warehouse = 3;
+                this.ModefySupplyWarehousing(is_warehouse, warehousing_id);
+              }
+            }
+          }
+        }
+      });
+    },
+    ModefySupplyWarehousing(is_warehouse, warehousing_id) {
+      var params = {
+        is_warehouse: this.is_warehouse,
+        warehousing_id: this.warehousing_id,
+      };
+      ModefySupplyWarehousing(params).then((response) => {
+        if (response.data.state == 1) {
+          var msg = response.data.data.msg;
+        }
+      });
+    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/addGoodReturn.vue

@@ -162,12 +162,12 @@
                   placeholder="请选择"
                   :disabled="disabled"
                 >
-                  <!-- <el-option
-                            v-for="(item,index) in scope.row.unitList"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.name">
-                        </el-option> -->
+                  <el-option
+                    v-for="(item,index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
+                   </el-option>
                 </el-select>
               </el-form-item>
             </template>
@@ -184,7 +184,7 @@
           <el-table-column label="可退数量" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_specification_name"
+                v-model="scope.row.count"
                 style="width: 150px"
                 :disabled="true"
                 placeholder="可退数量"
@@ -257,7 +257,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="源购货订单号" align="center" width="200px">
+          <el-table-column label="源采购订单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.good_number"
@@ -386,7 +386,7 @@ export default {
     return {
       tipsInfo: "",
       crumbs: [
-        { path: false, name: "购货单" },
+        { path: false, name: "退货单" },
         { path: "/good/return/add", name: "新增退货单" },
       ],
       showTwo: false,
@@ -603,6 +603,7 @@ export default {
       tempObj["supply_type"] = "";
       tempObj["supply_specification_name"] = "";
       tempObj["supply_total"] = "";
+      tempObj["count"] = "";
       tempObj["supply_count"] = "";
       tempObj["supply_price"] = "";
       tempObj["supply_total_price"] = "";
@@ -800,6 +801,7 @@ export default {
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
             orderInfo[i].supply_count = orderInfo[i].count;
+            orderInfo[i].count = orderInfo[i].count
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -962,6 +964,7 @@ export default {
     tempObj["supply_expiry_date"] = ""
     tempObj["warehousing_id"] =0
     tempObj["warehouse_info_id"] =0
+    tempObj["count"] = "";
     this.recordInfo.tableList.push(tempObj);
     console.log("即哪里地方2",this.recordInfo.tableList)
     this.getInitOrder();

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1211,6 +1211,7 @@ export default {
           var msg = response.data.data.msg;
           if (msg == 1) {
             this.$message.success("反审核成功!");
+            return 
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList

src/xt_pages/supply/components/editGoodReturn.vue

@@ -233,7 +233,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="源购货订单号" align="center" width="200px">
+          <el-table-column label="源采购订单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.good_number"
@@ -349,7 +349,7 @@ export default {
     return {
       tipsInfo:"",
       crumbs: [
-        { path: false, name: "购货单" },
+        { path: false, name: "退货单" },
         { path: "/good/return/add", name: "新增退货单" },
       ],
       showTwo: true,
@@ -845,7 +845,10 @@ export default {
        id:this.id,
      }
      checkReturnOrder(params).then(response=>{
-
+       if(response.data.state == 1){
+        var msg = response.data.data.msg
+        this.$message.success("保存成功!")
+       }
      })
     }
   },