生产领料调整

src/pages/login/login/index.vue

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

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

@@ -55,6 +55,10 @@
             <view style="width: 25%" class="list-item"> 是否过账: </view>
             <jPicker style="border: 2rpx solid; border-radius: 8rpx" @bindpicker="bookTypeChange($event, index)" :disabled="item.planNumber <= item.outNumber ? true : false" sureColor="#ff0000" showKey="label" valKey="value" :val="item.isguozhang.value" :options="reducelist" />
           </view>
+          <view class="row-list">
+            <view style="width: 25%" class="list-item"> 物料凭证: </view>
+            <view style="width: 80%"> {{ item.userDefined9 ? item.userDefined9 : '无' }} </view>
+          </view>
         </view>
       </u-form>
     </view>
@@ -221,14 +225,43 @@ export default class ProductionREQ extends BasePage {
     if (model.getidcardcode == '200') {
       let alreadyList = model.byidcardobj;
       alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
-      this.materilist.forEach((item) => {
-        if (item.materialCode == alreadyList.materialCode) {
-          item.outNumber = item.outNumber + alreadyList.amount;
-          alreadyList.produceCode = item.produceCode;
-        }
-      });
+      let tianjiaflage = this.materilist.some((item) => item.materialCode == alreadyList.materialCode);
+      if (tianjiaflage) {
+        this.materilist.forEach((item) => {
+          if (item.materialCode == alreadyList.materialCode) {
+            if (item.userDefined9) {
+              uni.showModal({
+                content: '否要进行加料?',
+                success: (res) => {
+                  if (res.confirm) {
+                    item.outNumber = item.outNumber + alreadyList.amount;
+                    alreadyList.produceCode = item.produceCode;
+                    this.list.push(alreadyList);
+                  } else if (res.cancel) {
+                    //alreadyList.flage = true;
+                    //不添加数量
+                  }
+                },
+              });
+            } else {
+              item.outNumber = item.outNumber + alreadyList.amount;
+              alreadyList.produceCode = item.produceCode;
+              this.list.push(alreadyList);
+            }
+          }
+        });
+      } else {
+        (this.$refs.uToast as any).show({
+          title: '无对应物料',
+          type: 'waring',
+        });
+        this.Idcard = '';
+        this.twofouces = true;
+        return;
+      }
+
       //alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
-      this.list.push(alreadyList);
+
       this.Idcard = '';
       this.twofouces = true;
     }
@@ -307,6 +340,7 @@ export default class ProductionREQ extends BasePage {
         item.outNumber -= deletobj.amount;
       }
     });
+
     (this.$refs.uToast as any).show({
       title: '删除成功',
       type: 'success',
@@ -421,7 +455,7 @@ body {
     background-color: #fff;
     padding: 20rpx 20rpx 20rpx;
     border-radius: 10rpx;
-    height: 280rpx;
+    height: 340rpx;
     overflow: scroll;
     margin-bottom: 6rpx;
     //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);