生产领料调整

This reverts commit dae9c602c2.

src/pages/login/login/index.vue

@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.173'; //正式版本号
+  version = '0.0.179'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

src/pages/wms/Raw/ProductionREQ/index.vue

@@ -43,8 +43,18 @@
           </view>
           <view class="row-list">
             <view class="row-list-item1">
-              <view class="list-item"> 应出/已出: </view>
-              <view> {{ item.planNumber }}/{{ item.outNumber }} </view>
+              <view class="list-item"> 应出: </view>
+              <view> {{ item.planNumber }} </view>
+            </view>
+            <view class="row-list-item2">
+              <view class="list-item"> 已出: </view>
+              <view> {{ item.outNumber }} </view>
+            </view>
+          </view>
+          <view class="row-list">
+            <view class="row-list-item1">
+              <view class="list-item"> 未出: </view>
+              <view> {{ parseFloat(item.planNumber) - parseFloat(item.outNumber) }} </view>
             </view>
             <view class="row-list-item2">
               <view class="list-item"> 单位: </view>
@@ -493,7 +503,7 @@ body {
     background-color: #fff;
     padding: 20rpx 20rpx 20rpx;
     border-radius: 10rpx;
-    height: 340rpx;
+    height: 350rpx;
     overflow: scroll;
     margin-bottom: 6rpx;
     //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);

src/pages/wms/Raw/ReceiveSRM/index.vue

@@ -277,27 +277,37 @@ export default class receiveSRM extends BasePage {
     };
     await this.model.PurchaseOrderPda(query);
     let prodlist = model.orderNoItemList;
-    this.reducelist = this.uniqueArray(prodlist);
-    this.reducelist.forEach((item) => {
-      item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
-      item.label = item.materialDesc;
-    });
-    console.log('this.reducelist', this.reducelist);
-    this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0];
-    this.oldprodlist = prodlist.map((item) => {
-      let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
-      return {
-        ...item,
-        handlematerialCode: newmaterialCode,
-        realityaddNumber: item.realityNumber,
-      };
-    });
-    this.list = this.oldprodlist.filter((item) => {
-      return item.handlematerialCode == this.bimWl.value;
-    });
+    if (prodlist.length > 0) {
+      this.isdisabled = false;
+      this.reducelist = this.uniqueArray(prodlist);
+      this.reducelist.forEach((item) => {
+        item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+        item.label = item.materialDesc;
+      });
+      console.log('this.reducelist', this.reducelist);
+      this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0];
+      this.oldprodlist = prodlist.map((item) => {
+        let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+        return {
+          ...item,
+          handlematerialCode: newmaterialCode,
+          realityaddNumber: item.realityNumber,
+        };
+      });
+      this.list = this.oldprodlist.filter((item) => {
+        return item.handlematerialCode == this.bimWl.value;
+      });
 
-    //查询标志卡
-    this.querycard();
+      //查询标志卡
+      this.querycard();
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '请去到货登记!',
+        type: 'default',
+        duration: 3000,
+      });
+      this.isdisabled = true;
+    }
   }
   //查询标志卡
   async querycard() {

src/pages/wms/Raw/ReturnMaterials/index.vue

@@ -12,25 +12,19 @@
         <u-form-item label="退料单">
           <u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
         </u-form-item>
-        <!-- <u-form-item label="库区">
-          <u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
-        </u-form-item>
-        <u-form-item label="仓库">
-          {{ waCodeList && waCodeList.warehouseName }}
-        </u-form-item> -->
-        <u-form-item label="标志卡">
+        <!-- <u-form-item label="标志卡">
           <u-search placeholder="请扫描" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
-        </u-form-item>
+        </u-form-item> -->
       </u-form>
-      <u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" :style="{ marginTop: '1rpx', backgroundColor: item.planNumber <= item.returnNumber ? '#4eea9b59' : '#ffffff' }" class="form3">
+      <u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" style="margin-top: 1rpx; background-color: #ffffff" class="form3">
         <view class="list">
           <view class="row-list">
             <view style="width: 25%" class="list-item"> 退料单: </view>
-            <view style="width: 80%"> {{ item.produceCode }} </view>
+            <view style="width: 80%"> {{ item.procureCode }} </view>
           </view>
           <view class="row-list">
-            <view style="width: 25%" class="list-item"> 过账凭证: </view>
-            <view style="width: 80%"> {{ item.userDefined9 || '' }} </view>
+            <view style="width: 25%" class="list-item"> 标志卡: </view>
+            <view> {{ item.sn }} </view>
           </view>
           <view class="row-list">
             <view style="width: 25%" class="list-item"> 物料编码: </view>
@@ -41,6 +35,10 @@
             <view style="width: 80%"> {{ item.materialDesc }} </view>
           </view>
           <view class="row-list">
+            <view style="width: 25%" class="list-item"> 数量: </view>
+            <view style="width: 80%"> {{ item.planNumber }} </view>
+          </view>
+          <!-- <view class="row-list">
             <view class="row-list-item1">
               <view class="list-item"> 计划/已退: </view>
               <view> {{ item.planNumber }}/{{ item.returnNumber }} </view>
@@ -49,12 +47,12 @@
               <view class="list-item"> 单位: </view>
               <view> {{ item.unit }} </view>
             </view>
-          </view>
+          </view> -->
         </view>
       </u-form>
     </view>
     <!-- <view style="height: 14rpx"></view> -->
-    <view class="scroll">
+    <!-- <view class="scroll">
       <view v-for="(item, index) in list" :key="item.id">
         <u-form style="margin-top: 10rpx" class="form2">
           <view class="list">
@@ -82,17 +80,17 @@
           </view>
         </u-form>
       </view>
-    </view>
+    </view> -->
     <view class="bottom-bar">
       <u-row class="button-bar">
         <!-- 确定 -->
-        <u-col :span="6">
-          <u-button @click="onSubmit" type="primary">确认入库</u-button>
+        <u-col :span="12">
+          <u-button @click="onSubmit" type="primary">一键回仓</u-button>
         </u-col>
         <!-- 返回 -->
-        <u-col :span="6">
+        <!-- <u-col :span="6">
           <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
-        </u-col>
+        </u-col> -->
       </u-row>
     </view>
     <u-toast ref="uToast" />
@@ -163,10 +161,9 @@ export default class ReturnMaterials extends BasePage {
     await this.model.ProductionMaterialRequisition(this.orderNo);
     if (model.orderNoItemList) {
       this.materilist = [];
-      this.list = [];
+      // this.list = [];
       this.materilist = model.orderNoItemList;
       this.materilist.forEach((item) => {
-        item.returnoutNumber = item.returnNumber;
         item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
       });
     } else {
@@ -234,33 +231,19 @@ export default class ReturnMaterials extends BasePage {
       });
       return;
     }
-    // if (this.areaCode == '') {
-    //   (this.$refs.uToast as any).show({
-    //     title: '请先扫描或输入库区',
-    //     type: 'default',
-    //   });
-    //   return;
-    // }
-    // if (Object.keys(this.waCodeList).length == 0) {
-    //   (this.$refs.uToast as any).show({
-    //     title: '没有仓库信息',
-    //     type: 'default',
-    //   });
-    //   return;
-    // }
 
-    if (this.list.length == 0 || this.list == '') {
-      (this.$refs.uToast as any).show({
-        title: '请先扫描标志卡',
-        // url: '/pages/user/index'
-      });
-      return;
-    }
+    // if (this.list.length == 0 || this.list == '') {
+    //   (this.$refs.uToast as any).show({
+    //     title: '请先扫描标志卡',
+    //     // url: '/pages/user/index'
+    //   });
+    //   return;
+    // }
     let params = [];
-    this.list.map((item) => {
+    this.materilist.map((item) => {
       params.push({
         createBy: session.loginName,
-        factoryCode: session.FactoryCode,
+        factoryCode: item.siteCode,
         // whCode: this.waCodeList.warehouseCode,
         // waCode: this.areaCode,
         planNumber: item.planNumber,
@@ -269,7 +252,7 @@ export default class ReturnMaterials extends BasePage {
         materialCode: item.materialCode,
         materialDesc: item.materialDesc,
         userDefined3: item.userDefined4,
-        sn: item.userDefined1,
+        sn: item.sn,
         userDefined5: item.userDefined7 || null,
       });
     });
@@ -290,11 +273,12 @@ export default class ReturnMaterials extends BasePage {
     }
   }
   mepty() {
-    this.list = [];
+    // this.list = [];
     this.materilist = [];
+    this.orderNo = '';
     //this.areaCode = '';
     //this.waCodeList = {};
-    this.query();
+    //this.query();
   }
   delet(deletobj, index) {
     this.list.splice(index, 1);
@@ -417,7 +401,7 @@ body {
     background-color: #fff;
     padding: 20rpx 20rpx 20rpx;
     border-radius: 10rpx;
-    height: 260rpx;
+    height: 310rpx;
     overflow: scroll;
     margin-bottom: 6rpx;
     //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);

src/pages/wms/Raw/ReturnMaterials/model.ts

@@ -13,8 +13,8 @@ export class ReturnMaterials extends VuexModule {
   orderNoItemList: any = [];
   @MutationAction
   async ProductionMaterialRequisition(orderNo: any) {
-    const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.listReturnSC, {
-      produceCode: orderNo,
+    const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.newselectOrderCardTLTWO, {
+      procureCode: orderNo,
       factoryCode: session.FactoryCode,
     });
     // http.defaults.headers.common['Accept-Language'] = session.PoolName;

src/utils/url.ts

@@ -174,6 +174,7 @@ export const url = {
         listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC',
         addReturnSC: qianzhuione + '/wms/WmsToWCSmission/addReturnSC',
         selectOrderCardTL: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTL',
+        newselectOrderCardTLTWO: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTLTWO',
       },
       TrayStatusUpdate: {
         out: qianzhuione + '/wms/order/TraystatusUpdate',