overseamom-481 feat 手工单手持页面修改

src/pages/product/warehouse/fgConsuming/index.vue

@@ -160,7 +160,7 @@ export default class ProductCheckReceipt extends BasePage {
       locCode: this.Some.originWl,
       order1: this.form.order3,
     };
-    await this.model.getProductCode(params);
+    await this.model.getProductCodeFgConsuming(params);
     if (this.model.code == '1') {
       //this.customToast(this.$t('message.product_Tip8') as string);
       uni.showToast({
@@ -186,7 +186,7 @@ export default class ProductCheckReceipt extends BasePage {
               factoryCode: session.factoryCode,
               loginName: session.loginName,
             };
-            await this.model.codeDel(params);
+            await this.model.codeDelFgConsuming(params);
             if (this.model.delCode == '1') {
               this.customToast(this.$t('message.success') as string);
               this.form.barcode = '';
@@ -246,7 +246,7 @@ export default class ProductCheckReceipt extends BasePage {
           if (res.confirm) {
             //debugger;
             console.log('////111111');
-            this.model.close(this.form.order3);
+            this.model.closeFgConsuming(this.form.order3);
             if (this.model.code == '1') {
               uni.showToast({
                 //icon: 'success',
@@ -267,7 +267,7 @@ export default class ProductCheckReceipt extends BasePage {
       });
       return;
     }
-    await this.model.close(this.form.order3);
+    await this.model.closeFgConsuming(this.form.order3);
     if (this.model.code == '1') {
       uni.showToast({
         //icon: 'success',
@@ -288,7 +288,7 @@ export default class ProductCheckReceipt extends BasePage {
       this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     }
-    await this.model.queryDetailed(this.form.order3);
+    await this.model.queryDetaileFgConsuming(this.form.order3);
     this.toPage(this.page.product.warehouse.wholeCollect.stoOutboundDetail);
   }
 }

src/pages/product/warehouse/fgConsuming/model.ts

@@ -102,7 +102,7 @@ export class wholeCollect extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async getProductCode(params: any) {
+  async getProductCodeFgConsuming(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.content, params);
     const orderInInfo = res.data.records[0];
     const code = res.code;
@@ -110,7 +110,7 @@ export class wholeCollect extends VuexModule {
   }
   //退扫
   @MutationAction
-  async codeDel(params: any) {
+  async codeDelFgConsuming(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
     const delCode = res.code;
     return { delCode };
@@ -151,7 +151,7 @@ export class wholeCollect extends VuexModule {
    * 修改库位
    */
   @Action({ commit: 'updateCheckedOrderInInfoListKw' })
-  async changeOrderInLocation(kw: string) {
+  async changeOrderInLocationFgConsuming(kw: string) {
     await http.post('/wmspda/material/orderin/enter', {
       loginName: session.loginName,
       warehouseCode: '',
@@ -166,7 +166,7 @@ export class wholeCollect extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async queryDetailed(proMoveCode: any) {
+  async queryDetaileFgConsuming(proMoveCode: any) {
     const { code, data } = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, {
       proMoveCode,
       factoryCode: session.factoryCode as string,
@@ -181,7 +181,7 @@ export class wholeCollect extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async close(proMoveCode: any) {
+  async closeFgConsuming(proMoveCode: any) {
     const { code } = await http.post(url.warehouse.rowTransfer.close, {
       factoryCode: session.factoryCode as string,
       loginName: session.loginName as string,

src/pages/product/warehouse/fgScrap/index.vue

@@ -147,7 +147,7 @@ export default class productCheckReceipt extends BasePage {
       locCode: this.Some.originWl,
       order1: this.form.order3,
     };
-    await this.model.getProductCode(params);
+    await this.model.getProductCodeFgScrap(params);
     if (this.model.code == '1') {
       //this.customToast(this.$t('message.product_Tip8') as string);
       uni.showToast({
@@ -173,7 +173,7 @@ export default class productCheckReceipt extends BasePage {
               loginName: session.loginName,
               order3: this.form.order3,
             };
-            await this.model.codeDel(params);
+            await this.model.codeDelFgScrap(params);
             if (this.model.delCode == '1') {
               this.customToast(this.$t('message.success') as string);
               this.form.barcode = '';
@@ -275,7 +275,7 @@ export default class productCheckReceipt extends BasePage {
         cancelText: this.$t('message.Cancel') as string,
         success: (res: any) => {
           if (res.confirm) {
-            model.close(this.form.order3);
+            model.closeFgScrap(this.form.order3);
             if (this.model.code == '1') {
               uni.showToast({
                 //icon: 'success',
@@ -296,7 +296,7 @@ export default class productCheckReceipt extends BasePage {
       });
       return;
     }
-    await this.model.close(this.form.order3);
+    await this.model.closeFgScrap(this.form.order3);
     if (this.model.code == '1') {
       uni.showToast({
         //icon: 'success',
@@ -317,7 +317,7 @@ export default class productCheckReceipt extends BasePage {
       this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     }
-    await this.model.queryDetailed(this.form.order3);
+    await this.model.queryDetaileListFgScrap(this.form.order3);
     this.toPage(this.page.product.warehouse.wholeScrap.stoOutboundDetail);
   }
 }

src/pages/product/warehouse/fgScrap/model.ts

@@ -89,7 +89,7 @@ export class wholeScrap extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async getProductCode(params: any) {
+  async getProductCodeFgScrap(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.content, params);
     const orderInInfo = res.data.records[0];
     const code = res.code;
@@ -97,7 +97,7 @@ export class wholeScrap extends VuexModule {
   }
   //退扫
   @MutationAction
-  async codeDel(params: any) {
+  async codeDelFgScrap(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
     const delCode = res.code;
     return { delCode };
@@ -114,7 +114,7 @@ export class wholeScrap extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async queryDetailed(proMoveCode: any) {
+  async queryDetaileListFgScrap(proMoveCode: any) {
     const { code, data } = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, {
       proMoveCode,
       factoryCode: session.factoryCode as string,
@@ -129,7 +129,7 @@ export class wholeScrap extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async close(proMoveCode: any) {
+  async closeFgScrap(proMoveCode: any) {
     const { code } = await http.post(url.warehouse.rowTransfer.close, {
       factoryCode: session.factoryCode as string,
       loginName: session.loginName as string,
@@ -185,7 +185,7 @@ export class wholeScrap extends VuexModule {
    * 修改库位
    */
   @Action({ commit: 'updateCheckedOrderInInfoListKw' })
-  async changeOrderInLocation(kw: string) {
+  async changeOrderInLocationFgScrap(kw: string) {
     await http.post('/wmspda/material/orderin/enter', {
       loginName: session.loginName,
       // loginName: '1999',

src/pages/product/warehouse/fgTransfer/Local-details.vue

@@ -46,7 +46,7 @@ export default class RawReceiptDetail extends BasePage {
       // cpRef4: model.userDefined,
       proMoveCode: this.userDefined4,
     };
-    await this.model.querydetaildlist(content);
+    await this.model.queryDetailListFgTransfer(content);
     let arr = this.model.detailedList;
     arr.forEach((item: any) => {
       if (item.oiType == 10 || item.oiType == '10') {

src/pages/product/warehouse/fgTransfer/index.vue

@@ -136,7 +136,7 @@ export default class productCheckReceipt extends BasePage {
       factoryCode: session.factoryCode,
       loginName: session.loginName,
     };
-    await model.getProductCode(params);
+    await model.getProductCodeFgTransfer(params);
     if (this.model.code == '1') {
       uni.showToast({
         //icon: 'success',
@@ -159,7 +159,7 @@ export default class productCheckReceipt extends BasePage {
               factoryCode: session.factoryCode,
               loginName: session.loginName,
             };
-            await this.model.codeDel(params);
+            await this.model.codeDelFgTransfer(params);
             if (this.model.delCode == '1') {
               this.customToast(this.$t('message.success') as string);
               this.form.productCode = '';
@@ -184,7 +184,7 @@ export default class productCheckReceipt extends BasePage {
       factoryCode: session.factoryCode,
       proMoveCode: this.userDefined4,
     };
-    await this.model.QueryHistory(params);
+    await this.model.QueryHistoryFgTransfer(params);
     this.model.removeList.forEach((item: any) => {
       this.allNum += parseFloat(item.proNum);
     });
@@ -214,7 +214,7 @@ export default class productCheckReceipt extends BasePage {
   }
   //点击生成随机移库码
   async generate() {
-    await this.model.getTransferNo({
+    await this.model.getTransferNoFgTransfer({
       loginName: session.loginName,
     });
     this.userDefined4 = model.userDefined;

src/pages/product/warehouse/fgTransfer/model.ts

@@ -89,7 +89,7 @@ export class wholeTransfer extends VuexModule {
    * @param dnNo
    */
   @MutationAction
-  async getProductCode(params: any) {
+  async getProductCodeFgTransfer(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.content, params);
     const code = res.code;
     const orderInInfo = res.data.records[0];
@@ -106,7 +106,7 @@ export class wholeTransfer extends VuexModule {
   }
   //退扫
   @MutationAction
-  async codeDel(params: any) {
+  async codeDelFgTransfer(params: any) {
     const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
     const delCode = res.code;
     return { delCode };
@@ -128,14 +128,14 @@ export class wholeTransfer extends VuexModule {
   }
   //生成移库码
   @MutationAction
-  async getTransferNo(loginName: any) {
+  async getTransferNoFgTransfer(loginName: any) {
     const res: any = await http.post(url.warehouse.rowTransfer.getCode, loginName);
     const userDefined: any = res.data;
     return { userDefined };
   }
   //查询已扫物料
   @MutationAction
-  async QueryHistory(params: any = {}) {
+  async QueryHistoryFgTransfer(params: any = {}) {
     const res: any = await http.post(url.warehouse.rowTransfer.queryGroupLis, params);
     const removeList: any = res.data;
     const removeMaterialList: any = [];
@@ -150,7 +150,7 @@ export class wholeTransfer extends VuexModule {
   }
   //查询明细
   @Action({ commit: 'updateCheckedOrderInInfoListKw' })
-  async querydetaildlist(content: any) {
+  async queryDetailListFgTransfer(content: any) {
     const res: any = await http.post('/wmspda/fg/queryListByMoveCode', content);
     console.log('明细》》》》》》》》》', res.list);
     this.detailedList = res.data;
@@ -186,7 +186,7 @@ export class wholeTransfer extends VuexModule {
    * 修改库位
    */
   @Action({ commit: 'updateCheckedOrderInInfoListKw' })
-  async changeOrderInLocation(kw: string) {
+  async changeOrderInLocationFgTransfer(kw: string) {
     await http.post('/wmspda/material/orderin/enter', {
       loginName: session.loginName,
       // loginName: '1999',

src/pages/raw/warehouse/rawConsuming/index.vue

@@ -82,6 +82,7 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     } else {
+      this.MaterialList = [];
       await this.model.queryConsumingInfoRaw({
         order3: this.order3,
       });

src/pages/raw/warehouse/rawScrap/index.vue

@@ -83,6 +83,7 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     } else {
+      this.MaterialList = [];
       await this.model.queryScrapInfoRaw({
         order3: this.order3,
       });
@@ -117,6 +118,8 @@ export default class KanDanHandOver extends BasePage {
   }
   //提交
   async submit() {
+    console.log('走这里了');
+
     if (this.order3 === '') {
       this.customToast(this.$t('message.Commission_tips1') as string);
       return;
@@ -134,7 +137,11 @@ export default class KanDanHandOver extends BasePage {
     this.Some.keepBy = session.loginName;
     this.Some.orderType = '1';
     orderlist.push(this.Some);
-    await model.scrapConfirmRaw(orderlist);
+    await model.scrapConfirmRaw(orderlist).then((res) => {
+      console.log(res);
+    });
+    console.log('走这里了2');
+
     if (this.model.code == '1') {
       uni.showToast({
         //icon: 'success',