退料 新增库位

src/i18n/lang/cn.ts

@@ -195,25 +195,13 @@ export default {
     RowRelocation: "原材料移库",
     RowCollectionAndBorrowing: "原材料领用借用",
 
-<<<<<<< Updated upstream
-     // 原材料盘点
-     InventoryOrderNo:'单号',
-     InventoryMaterielNo:'物料号',
-     InventoryMateriel:'物料名',
-     InventoryTotalNumber:'盘点总数',
-     InventoryPleaseScan: "请扫描单号",
-<<<<<<< HEAD
-=======
-     InventoryFinish: "完成",
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
-=======
     // 原材料盘点
     InventoryOrderNo: "单号",
     InventoryMaterielNo: "物料号",
     InventoryMateriel: "物料名",
     InventoryTotalNumber: "盘点总数",
     InventoryPleaseScan: "请扫描单号",
->>>>>>> Stashed changes
+    InventoryFinish: "完成",
 
     // 委外-入库
     CommissionEntrant: "委外入库",

src/i18n/lang/en.ts

@@ -191,7 +191,7 @@ export default {
     Scrap: "FG scrap",
     CollectionAndBorrowing: "FG cost center",
     Inventory: "FG PSV",
-    raw_Inventory:'raw Inventory',
+    raw_Inventory: "raw Inventory",
 
     RowWarehouse: "RAW WH",
     SemiProductZC: "SFG transfer",
@@ -200,30 +200,27 @@ export default {
     RowCollectionAndBorrowing: "RAW cost center",
 
     // 原材料盘点
-    InventoryOrderNo:'单号',
+    InventoryOrderNo: "单号",
-    InventoryMaterielNo:'MAT code',
+    InventoryMaterielNo: "MAT code",
-    InventoryMateriel:'MAT name',
+    InventoryMateriel: "MAT name",
-    InventoryTotalNumber:'Total',
+    InventoryTotalNumber: "Total",
     InventoryPleaseScan: "Please scan No.",
-<<<<<<< HEAD
-=======
     InventoryFinish: "Finish",
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
 
     // 委外-入库
-    CommissionEntrant:'委外入库',
+    CommissionEntrant: "委外入库",
-    CommissionedSingleNumber:'单号',
+    CommissionedSingleNumber: "单号",
-    CommissionedMaterielNo:'物料号',
+    CommissionedMaterielNo: "物料号",
-    CommissionedMaterielDesc:'物料描述',
+    CommissionedMaterielDesc: "物料描述",
-    CommissionedDemandData:'需求数据',
+    CommissionedDemandData: "需求数据",
-    CommissionedCumulativeData:'累计数据',
+    CommissionedCumulativeData: "累计数据",
-    CommissionedLocation:'库位',
+    CommissionedLocation: "库位",
-    CommissionedThisNumber:'本次数量',
+    CommissionedThisNumber: "本次数量",
-    CommissionedEntrantDetails:'入库明细',
+    CommissionedEntrantDetails: "入库明细",
 
     // 委外-出库
-    CommissionGoOut:'委外出库',
+    CommissionGoOut: "委外出库",
-    CommissionedGoOutDetails:'出库明细',
+    CommissionedGoOutDetails: "出库明细",
 
     //移库
     Warehouse_QueryCriteria: "Query criteria",

src/pages.json

@@ -242,7 +242,6 @@
             }
         },
         {
-<<<<<<< HEAD
           "path": "pages/raw/ingoods/poReceipt/poReceiving",
           "style": {
               "navigationBarTitleText": "PO单收货",
@@ -251,8 +250,6 @@
           }
       },
         {
-=======
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
             "path": "pages/raw/ingoods/poReceipt/idetailed",
             "style": {
                 "navigationBarTitleText": "PO退货",
@@ -277,7 +274,6 @@
             }
         },
         {
-<<<<<<< HEAD
           "path": "pages/raw/ingoods/dnReceipt/ImportDN",
           "style": {
               "navigationBarTitleText": "海外DN收货",
@@ -294,8 +290,6 @@
           }
       },
         {
-=======
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
             "path": "pages/raw/ingoods/dnReceipt/idetailed",
             "style": {
                 "navigationBarTitleText": "DN单收货",
@@ -352,7 +346,6 @@
             }
         },
         {
-<<<<<<< HEAD
           "path": "pages/raw/handover/picking/ByOrder",
           "style": {
               "navigationBarTitleText": "拣配查询",
@@ -369,8 +362,6 @@
         }
     },
         {
-=======
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
             "path": "pages/raw/handover/picking/idetailed",
             "style": {
                 "navigationBarTitleText": "DN退货",

src/pages/raw/handover/returning/index.vue

@@ -28,13 +28,13 @@
         :label="this.$t('message.Pi_OrderNo')"
         prop="prdOrder"
       >
-        <!-- <u-search
+        <u-search
           :placeholder="this.$t('message.po_PleaseInput')"
           v-model="form.prdOrder"
           @search="model.queryOrderInInfo"
           :show-action="false"
-        ></u-search> -->
+        ></u-search>
-        <jPicker
+        <!-- <jPicker
           sureColor="#ff0000"
           style="width: 230rpx"
           @bindpicker="LocationChoice"
@@ -43,7 +43,7 @@
           :val="wlCode"
           class="search"
           :options="prdOrder"
-        />
+        /> -->
       </u-form-item>
       <u-form-item
         :required="true"
@@ -163,6 +163,7 @@ import { VForm, VFormRules } from "vue/types/form";
 import { auth } from "@/store/modules/auth";
 import model from "./model";
 import jPicker from "@/components/J-Picker/jPicker.vue";
+import { session } from "@/store/modules/session";
 
 @Component({
   components: {
@@ -195,6 +196,7 @@ export default class returningDom extends BasePage {
     // tlName: null, // 退料类型name
     materialCode: null, // 物料类型code
     wlName: "", // 物料类型name
+    wlCode: "",
   };
   prdOrder: any = [];
   wlCode: any = "";
@@ -228,12 +230,33 @@ export default class returningDom extends BasePage {
   };
   LocationChoice(e: any) {
     console.log("e>>>>>>>>>>>>>>>>>>>>>>>>", e);
+    this.form.wlCode = e.pickerName.label;
   }
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   async onReady() {
     this.$form.setRules(this.rules);
     // this.model.queryReturningTypeList();
     this.form.sapFactoryCode = await this.model.queryDefaultFactoryCode();
+    //页面初始化 获取可选库位
+    let means: any = JSON.parse(
+      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
+    );
+    let user: any = session.user;
+    let sendSpot = JSON.parse(localStorage.getItem("sendSpot") as any);
+    let content = {
+      loginName: means.session.user.loginName,
+      sendSpot: sendSpot,
+      factoryCode: means.session.user.factoryCode,
+      workArea: user.list[0].workareaCode,
+    };
+    let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
+    res.forEach((item: any) => {
+      let pickerName: any = {};
+      pickerName.label = item.locationCode;
+      pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
+      pickerName.sendSpot = item.sendSpot;
+      this.Location.push(pickerName);
+    });
   }
   cnoso() {
     console.log(1);

src/pages/raw/handover/returning/model.ts

@@ -1,9 +1,15 @@
-import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import {
-import store from '@/store';
+  Action,
-import http from '@/utils/request';
+  getModule,
-import { url } from '@/utils/url';
+  Module,
-import { auth } from '@/store/modules/auth';
+  MutationAction,
-import { session } from '@/store/modules/session';
+  VuexModule,
+} from "vuex-module-decorators";
+import store from "@/store";
+import http from "@/utils/request";
+import { url } from "@/utils/url";
+import { auth } from "@/store/modules/auth";
+import { session } from "@/store/modules/session";
 
 class OrderInInfo {
   amount?: any;
@@ -14,7 +20,7 @@ class OrderInInfo {
   namespaced: true,
   dynamic: true,
   store,
-  name: 'raw.handover.returning',
+  name: "raw.handover.returning",
 })
 export class ReturningModule extends VuexModule {
   /**
@@ -55,11 +61,11 @@ export class ReturningModule extends VuexModule {
     this.materielList = [];
     const { data }: any = await http.post(url.material.prdOrder.info, {
       prdOrderFrom,
-      page: '1',
+      page: "1",
-      rows: '50',
+      rows: "50",
       loginName: session.loginName,
     });
-    console.log('qqqqqqqqq', data);
+    console.log("qqqqqqqqq", data);
     const materielList = data.map((item: any) => ({
       label: item.materialCode,
       value: item.materialCode,
@@ -67,8 +73,8 @@ export class ReturningModule extends VuexModule {
       wkposCode: item.wkposCode,
       sendSpot: item.sendSpot,
     }));
-    console.log('物料列表', data);
+    console.log("物料列表", data);
-    console.log('物料名列表', materielList);
+    console.log("物料名列表", materielList);
     const orderInInfo = data[0] || {};
     return { orderInInfo, materielList };
   }
@@ -99,14 +105,22 @@ export class ReturningModule extends VuexModule {
       operatorPass: params.operator,
       factoryCode: session.factoryCode,
       loginName: session.loginName,
-      unit: '',
+      unit: "",
       ...params,
     });
     uni.showToast({
-      icon: 'success',
+      icon: "success",
-      title: 'success',
+      title: "success",
     });
   }
+  @Action({ commit: "updateCheckedOrderInInfoListKw" })
+  async queryByFactoryCodeAndWorkAreaCode(content: any) {
+    let res = await http.post(
+      "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
+      content
+    );
+    return res;
+  }
 }
 
 export default getModule(ReturningModule);

src/pages/raw/ingoods/index.vue

@@ -27,16 +27,7 @@
             >
           </u-button>
         </u-col>
-<<<<<<< Updated upstream
-<<<<<<< HEAD
-        <u-button @click="DNReceiving">DN收货</u-button>
-        <u-button @click="POReceiving">PO收货</u-button>
-        <u-button @click="importDN">海外DN</u-button>
-=======
 
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
-=======
->>>>>>> Stashed changes
         <!-- <u-col :span="12">
           <u-button @click="toPage(page.raw.ingoods.poReceipt.index)">
             <u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
@@ -63,6 +54,15 @@ export default class RawAppointment extends BasePage {
   onLoad(option: { childData: any }) {
     this.childData = JSON.parse(option.childData);
   }
+  DNReceiving() {
+    this.toPage(this.page.raw.ingoods.dnReceipt.dnReceiving);
+  }
+  POReceiving() {
+    this.toPage(this.page.raw.ingoods.poReceipt.poReceiving);
+  }
+  importDN() {
+    this.toPage(this.page.raw.ingoods.dnReceipt.importDN);
+  }
 }
 </script>
 

src/pages/raw/warehouse/rowCollect/details.vue

@@ -1,10 +1,15 @@
 <template>
   <view class="page-kan-dan-detail">
-    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
+    <view
+      class="header"
+      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
+    >
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <view class="title">{{ $t('message.borrow_CollectionAndBorrowingDetails') }}</view>
+      <view class="title">{{
+        $t("message.borrow_CollectionAndBorrowingDetails")
+      }}</view>
       <view class="right"></view>
     </view>
     <wyb-table
@@ -39,11 +44,13 @@
       <view class="container">
         <u-row>
           <u-col :span="6">
-            <u-button type="primary" @click="Confirm">{{ $t('message.dn_Confirm') }}</u-button>
+            <u-button type="primary" @click="Confirm">{{
+              $t("message.dn_Confirm")
+            }}</u-button>
           </u-col>
           <u-col :span="6">
             <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{
-              $t('message.po_Return')
+              $t("message.po_Return")
             }}</u-button>
           </u-col>
         </u-row>
@@ -53,18 +60,18 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component } from "vue-property-decorator";
-import { BasePage } from '@/components/base/page';
+import { BasePage } from "@/components/base/page";
-import model from './model';
+import model from "./model";
-import { session } from '@/store/modules/session';
+import { session } from "@/store/modules/session";
 // import { order, OrderDetail } from '@/pages/raw/warehouse/transfer/model';
 // import { auth } from '@/store/modules/auth';
 // import { pick, omit, cloneDeep } from 'lodash/fp';
-import { headers } from './config';
+import { headers } from "./config";
 
 @Component
 export default class KanDanHandOverDetails extends BasePage {
-  order = '';
+  order = "";
   headers = headers;
 
   /**
@@ -73,25 +80,36 @@ export default class KanDanHandOverDetails extends BasePage {
   model = model;
 
   async Confirm() {
-    const orderlist: any = this.model.orderInInfoList;
+    const orderlist: any = [];
+    this.model.orderInInfoList.forEach((item: any) => {
+      if (item.checked) {
+        orderlist.push(item);
+      }
+    });
+    if (orderlist.length == 0) {
+      uni.showToast({
+        icon: "none",
+        title: "请先选中要移库的数据" as any,
+      });
+      return;
+    }
     orderlist.forEach((item: any) => {
-      item.type = '1';
+      item.type = "1";
       item.keepBy = session.loginName;
-      item.orderType = '2';
+      item.orderType = "2";
     });
     await model.onTakeoutConfirm(orderlist);
-    // uni.navigateBack({ delta: 1 });
     setTimeout(() => {
       uni.navigateBack({ delta: 1 });
     }, 2000);
-    // uni.showToast({ icon: 'none', title: e.message });
   }
 }
 </script>
 
 <style lang="scss" scoped>
 .page-kan-dan-detail {
-  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2
+    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 118rpx 30rpx 162rpx;
   min-height: 100%;

src/pages/raw/warehouse/rowInventory/model.ts

@@ -32,12 +32,8 @@ class OrderInInfo {
   name: "raw.ingoods.dnReceipt",
 })
 export class ReceiptModule extends VuexModule {
-<<<<<<< HEAD
-=======
-  
   // 是否有
   isState = true;
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
   sendSpot = "";
   /**
    * sap库存地点列表
@@ -168,20 +164,20 @@ export class ReceiptModule extends VuexModule {
   }
 
   /**
-<<<<<<< HEAD
-=======
    * 查询单号
    * 查询盘点单号
    * @param pddNo
    */
   @Action
   async rawMaterialInventoryCheckRaw(pddNo: string) {
-
+    const { msg }: any = await http.post(
-     const { msg }: any = await http.post(url.material.rawMaterialInventory.checkRaw, {
+      url.material.rawMaterialInventory.checkRaw,
+      {
         pddNo,
         factoryCode: session.factoryCode,
         loginName: session.loginName,
-     });
+      }
+    );
     uni.showToast({
       icon: "none",
       title: msg,
@@ -197,20 +193,22 @@ export class ReceiptModule extends VuexModule {
    */
   @Action
   async checkRawProductCode(form: any) {
-      
+    const { code, msg }: any = await http.post(
-      const { code,msg }: any = await http.post(url.material.rawMaterialInventory.productCode, {
+      url.material.rawMaterialInventory.productCode,
+      {
         productCode: form.productCode,
         pddNo: form.pddNo,
         factoryCode: session.factoryCode,
         loginName: session.loginName,
-      });
+      }
+    );
     uni.showToast({
       icon: "none",
       title: msg,
     });
-      console.log('code:::',code,msg)
+    console.log("code:::", code, msg);
-      const isState = !!+code
+    const isState = !!+code;
-      return {isState}
+    return { isState };
   }
   /**
    * 新增单号、物料信息
@@ -221,12 +219,14 @@ export class ReceiptModule extends VuexModule {
    */
   @Action
   async checkRawCreateInfo(form: any) {
-
+    const { msg }: any = await http.post(
-      const { msg }: any = await http.post(url.material.rawMaterialInventory.createInfo, {
+      url.material.rawMaterialInventory.createInfo,
+      {
         ...form,
         factoryCode: session.factoryCode,
         loginName: session.loginName,
-      });
+      }
+    );
     uni.showToast({
       icon: "none",
       title: msg,
@@ -242,17 +242,18 @@ export class ReceiptModule extends VuexModule {
    */
   @Action
   async checkRawProductComplete(form: any) {
-
+    const { msg }: any = await http.post(
-     const { msg }: any = await http.post(url.material.rawMaterialInventory.productComplete, {
+      url.material.rawMaterialInventory.productComplete,
+      {
         ...form,
         factoryCode: session.factoryCode,
         loginName: session.loginName,
-     });
+      }
+    );
     uni.showToast({
       icon: "none",
       title: msg,
     });
-
   }
 
   /**
@@ -264,21 +265,21 @@ export class ReceiptModule extends VuexModule {
    */
   @Action
   async checkRawOrderComplete(pddNo?: string | null) {
-      
+    const { msg }: any = await http.post(
-      const { msg }: any = await http.post(url.material.rawMaterialInventory.orderComplete, {
+      url.material.rawMaterialInventory.orderComplete,
+      {
         pddNo,
         factoryCode: session.factoryCode,
         loginName: session.loginName,
-      });
+      }
+    );
     uni.showToast({
       icon: "none",
       title: msg,
     });
-
   }
 
   /**
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
    * 提交看单明细
    */
   @MutationAction

src/pages/raw/warehouse/rowScrap/details.vue

@@ -1,10 +1,13 @@
 <template>
   <view class="page-kan-dan-detail">
-    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
+    <view
+      class="header"
+      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
+    >
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <view class="title">{{ $t('message.Scrap_ScrapDetails') }}</view>
+      <view class="title">{{ $t("message.Scrap_ScrapDetails") }}</view>
       <view class="right"></view>
     </view>
     <wyb-table
@@ -39,11 +42,13 @@
       <view class="container">
         <u-row>
           <u-col :span="6">
-            <u-button type="primary" @click="Confirm">{{ $t('message.dn_Confirm') }}</u-button>
+            <u-button type="primary" @click="Confirm">{{
+              $t("message.dn_Confirm")
+            }}</u-button>
           </u-col>
           <u-col :span="6">
             <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{
-              $t('message.po_Return')
+              $t("message.po_Return")
             }}</u-button>
           </u-col>
         </u-row>
@@ -53,17 +58,17 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component } from "vue-property-decorator";
-import { BasePage } from '@/components/base/page';
+import { BasePage } from "@/components/base/page";
-import model from './model';
+import model from "./model";
 // import { auth } from '@/store/modules/auth';
 // import { pick, omit, cloneDeep } from 'lodash/fp';
-import { headers } from './config';
+import { headers } from "./config";
-import { session } from '@/store/modules/session';
+import { session } from "@/store/modules/session";
 
 @Component
 export default class KanDanHandOverDetails extends BasePage {
-  order = '';
+  order = "";
   headers = headers;
 
   /**
@@ -72,11 +77,23 @@ export default class KanDanHandOverDetails extends BasePage {
   model = model;
 
   async Confirm() {
-    const orderlist: any = this.model.orderInInfoList;
+    const orderlist: any = [];
+    this.model.orderInInfoList.forEach((item: any) => {
+      if (item.checked) {
+        orderlist.push(item);
+      }
+    });
+    if (orderlist.length == 0) {
+      uni.showToast({
+        icon: "none",
+        title: "请先选中要移库的数据" as any,
+      });
+      return;
+    }
     orderlist.forEach((item: any) => {
-      item.type = '1';
+      item.type = "1";
       item.keepBy = session.loginName;
-      item.orderType = '1';
+      item.orderType = "1";
     });
     await model.onTakeoutConfirm(orderlist);
     // uni.navigateBack({ delta: 1 });
@@ -89,7 +106,8 @@ export default class KanDanHandOverDetails extends BasePage {
 
 <style lang="scss" scoped>
 .page-kan-dan-detail {
-  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2
+    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 118rpx 30rpx 162rpx;
   min-height: 100%;

src/utils/page.ts

@@ -143,7 +143,6 @@ export const page = {
       rowInventory: {
         index: "/pages/raw/warehouse/rowInventory/index",
       },
-<<<<<<< HEAD
     },
     commission: {
       index: "/pages/raw/commission/index",
@@ -155,20 +154,7 @@ export const page = {
         index: "/pages/raw/commission/goOut/index",
         detail: "/pages/raw/commission/goOut/detail",
       },
-=======
->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f
     },
-    commission:{
-      index: "/pages/raw/commission/index",
-      entrant:{
-        index: "/pages/raw/commission/entrant/index",
-        detail: "/pages/raw/commission/entrant/detail",
-      },
-      goOut:{
-        index: "/pages/raw/commission/goOut/index",
-        detail: "/pages/raw/commission/goOut/detail",
-      }
-    }
   },
   SemiProduct: {
     index: "/pages/SemiProduct/index",