新增 退货

修复 工作区问题

src/i18n/lang/cn.ts

@@ -191,6 +191,7 @@ export default {
     return_Tip3: "数量不能为空",
     return_Tip4: "退料数量不能大于总数",
     quantitys: "不能大于应退货数量",
+    actual: "实际退货数量不等于应退货数量",
 
     //库内主菜单
     Warehouse: "成品库内",

src/i18n/lang/en.ts

@@ -192,6 +192,8 @@ export default {
     return_Tip3: "Qty cannot be empty",
     return_Tip4: "Return Qty cannot be greater than total Qty",
     quantitys: "Cannot be greater than the quantity to be returned",
+    actual:
+      "The actual returned quantity is not equal to the quantity to be returned",
 
     //库内主菜单
     Warehouse: "FG WH",

src/pages/login/area/index.vue

@@ -90,7 +90,7 @@ export default class AreaPage extends BasePage {
   headers = headers;
 
   async onOk() {
-    const selection = area.areas.find((a: any) => a.checked);
+    const selection: any = area.areas.find((a: any) => a.checked);
     if (selection === undefined) {
       uni.showToast({
         icon: "none",

src/pages/raw/commission/entrant/index.vue

@@ -187,13 +187,12 @@ export default class dnReceiptDom extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/commission/goOut/index.vue

@@ -187,13 +187,12 @@ export default class dnReceiptDom extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/aggregating/ByOrder.vue

@@ -265,13 +265,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/feeding/Location.vue

@@ -311,13 +311,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/picking/ByOrder.vue

@@ -300,13 +300,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/picking/BySummary.vue

@@ -305,13 +305,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/picking/idetailed.vue

@@ -120,13 +120,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/handover/picking/total.vue

@@ -120,13 +120,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

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

@@ -250,7 +250,6 @@ export default class returningDom extends BasePage {
     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);
     this.form.prdOrder = JSON.parse(sessionStorage.getItem("labelCode") as any);
     sessionStorage.removeItem("labelCode");
@@ -258,7 +257,7 @@ export default class returningDom extends BasePage {
       loginName: means.session.user.loginName,
       sendSpot: sendSpot,
       factoryCode: means.session.user.factoryCode,
-      workArea: user.list[0].workareaCode,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/ingoods/dnReceipt/ImportDN.vue

@@ -210,13 +210,12 @@ export default class dnReceiptDom extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/ingoods/dnReceipt/dnReceiving.vue

@@ -210,13 +210,12 @@ export default class dnReceiptDom extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/ingoods/dnReceipt/idetailed.vue

@@ -121,13 +121,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/ingoods/dnReturnGoods/Local-details.vue

@@ -62,7 +62,6 @@ export default class RawReceiptDetail extends BasePage {
       factoryCode: session.factoryCode,
     };
     await this.model.querydetaildlist(content);
-    console.log(model.detailedList);
   }
   go() {
     this.toPage(this.page.raw.ingoods.dnReturnGoods.location);

src/pages/raw/ingoods/dnReturnGoods/Location.vue

@@ -185,7 +185,7 @@ export default class RawReceiptDetail extends BasePage {
     let content = {
       loginName: means.session.user.loginName,
       factoryCode: means.session.user.factoryCode,
-      workArea: user.list[0].workareaCode,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactory(content);
     res.forEach((item: any) => {
@@ -202,6 +202,8 @@ export default class RawReceiptDetail extends BasePage {
   }
   //表格单选触发事件
   handleRow({ data }: any) {
+    this.LocationList = [];
+    this.qty = "";
     this.some = data[0].lineData;
   }
   //添加触发事件
@@ -270,6 +272,17 @@ export default class RawReceiptDetail extends BasePage {
    * 提交
    */
   async onSubmit() {
+    let num: number = 0;
+    this.some.list.forEach((item: any) => {
+      num += parseFloat(item.nowAmount);
+    });
+    if (num != parseFloat(this.some.poAmount)) {
+      uni.showToast({
+        icon: "none",
+        title: this.$t("message.actual") as any,
+      });
+      return;
+    }
     await this.model.submit({
       poNo: this.some.poNo,
       loginName: session.loginName,

src/pages/raw/ingoods/dnReturnGoods/model.ts

@@ -233,16 +233,15 @@ export class ReceiptModule extends VuexModule {
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async submit(content: any) {
     let res = await http.post(
-      "/material/outsourcing/into/materialComplete",
+      "/wmspda/material/poReturn/materialComplete",
       content
     );
     return res;
   }
-  @Action({ commit: "updateCheckedOrderInInfoListKw" })
+  @MutationAction
   async querydetaildlist(content: any) {
-    let res = await http.post("/material/outsourcing/into/info", content);
+    let res = await http.post("/wmspda/material/poReturn/info", content);
     let detailedList = res.data;
-    console.log(res);
     return { detailedList };
   }
 }

src/pages/raw/ingoods/poReceipt/idetailed.vue

@@ -121,13 +121,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/ingoods/poReceipt/poReceiving.vue

@@ -177,13 +177,12 @@ export default class dnReceiptDom extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {

src/pages/raw/warehouse/rowInventory/idetailed.vue

@@ -121,13 +121,12 @@ export default class RawReceiptDetail extends BasePage {
     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,
+      workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {