抽箱高亮显示，入库单号查询保存验证

src/app/enter-store-list/enter-store-list.page.html

@@ -38,7 +38,7 @@
       <ion-label>入库时间:{{es.modifiedtme}} </ion-label>
     </div>
     <div>
-      <ion-icon name="folder"></ion-icon>
+      <ion-icon name="person"></ion-icon>
       <ion-label>操作人:{{es.operator}} </ion-label>
     </div>
     <!-- <div>

src/app/es-apply-scan/es-apply-scan.page.html

@@ -49,7 +49,7 @@
         <ion-input class="ion-input" [(ngModel)]="store.scpCode" name="scpCode" #scpCode="ngModel" disabled>
         </ion-input>
       </ion-col>
-      <ion-col size="9" class="ion-col">
+      <ion-col size="6" class="ion-col">
         <ion-label class="disabled-input">
           中文品名:
         </ion-label>
@@ -81,20 +81,6 @@
         <ion-input class="ion-input" [(ngModel)]="store.qcName" name="qcName" #qcName="ngModel" disabled>
         </ion-input>
       </ion-col>
-      <ion-col size="3" class="mode-input">
-        <div>
-          <ion-label>
-            入库箱数:
-          </ion-label>
-          <ion-input placeholder="请输入" class="es-input" [(ngModel)]="store.enterBoxs" type="number"
-            (ionFocus)="hideKeyboard()" name="enterBoxs" required></ion-input>
-        </div>
-        <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.enterBoxs&&clicked)" class="ion-padding-start">
-            请输入入库箱数
-          </p>
-        </ion-text>
-      </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
@@ -139,6 +125,20 @@
           </p>
         </ion-text>
       </ion-col>
+      <ion-col size="3" class="mode-input">
+        <div>
+          <ion-label>
+            入库箱数:
+          </ion-label>
+          <ion-input placeholder="请输入" class="es-input" [(ngModel)]="store.enterBoxs" type="number"
+            (ionFocus)="hideKeyboard()" name="enterBoxs" required></ion-input>
+        </div>
+        <ion-text class="mode-input-danger" color="danger">
+          <p style="padding-left: 0;" [hidden]="!(!store.enterBoxs&&clicked)" class="ion-padding-start">
+            请输入入库箱数
+          </p>
+        </ion-text>
+      </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>

src/app/es-apply-scan/es-apply-scan.page.ts

@@ -13,8 +13,7 @@ import { Device } from '@ionic-native/device/ngx'
 })
 export class EsApplyScanPage implements OnInit {
 
-  esStoreDetailList = [
-  ]
+  esStoreDetailList = []
   clicked = false
   esStoreList = [
   ]
@@ -23,6 +22,7 @@ export class EsApplyScanPage implements OnInit {
   pId: number
   sscId: number
   entergoodsCode: any
+  canSubmit: boolean = true
   constructor(
     private device: Device,
     private storage: Storage,
@@ -111,7 +111,6 @@ export class EsApplyScanPage implements OnInit {
 
   // 获取入库单详情
   async getStoreDetail(item?) {
-    console.log('detail')
     // if (item) {
     //   this.scanCode = item.scanCode
     //   this.esStoreDetailList = new Array(item)
@@ -135,33 +134,33 @@ export class EsApplyScanPage implements OnInit {
     // }
   }
   // 记录数据
-  async saveRecord() {
-    console.log(this.esStoreDetailList)
-    // this.clicked = true
-    // // if (form.valid) {
-    // // 是否已扫描记录过该数据
-    // let filterData = []
-    // filterData = this.esStoreList.filter(item => {
-    //   return item.scanCode === this.esStoreDetailList[0].scanCode
-    // })
-    // // 有则更新
-    // if (filterData.length !== 0) {
-    //   filterData = this.esStoreDetailList
-    //   // 无则加上  
-    // } else {
-    //   this.esStoreList = this.esStoreList.concat(this.esStoreDetailList)
-    // }
-    // // 显示记录中的外销合同号
-    // for (let i of this.esStoreList) {
-    //   for (let j of i.detailList) {
-    //     j.enterCount = Number(j.enterBoxs) * Number(j.scpOutrate)
-    //     j.amount = j.enterCount
-    //   }
-    // }
-    // this.storage.set('esStoreList', JSON.stringify(this.esStoreList))
-    // this.initialData()
-    // }
-  }
+  // async saveRecord() {
+  //   console.log(this.esStoreDetailList)
+  // this.clicked = true
+  // // if (form.valid) {
+  // // 是否已扫描记录过该数据
+  // let filterData = []
+  // filterData = this.esStoreList.filter(item => {
+  //   return item.scanCode === this.esStoreDetailList[0].scanCode
+  // })
+  // // 有则更新
+  // if (filterData.length !== 0) {
+  //   filterData = this.esStoreDetailList
+  //   // 无则加上  
+  // } else {
+  //   this.esStoreList = this.esStoreList.concat(this.esStoreDetailList)
+  // }
+  // // 显示记录中的外销合同号
+  // for (let i of this.esStoreList) {
+  //   for (let j of i.detailList) {
+  //     j.enterCount = Number(j.enterBoxs) * Number(j.scpOutrate)
+  //     j.amount = j.enterCount
+  //   }
+  // }
+  // this.storage.set('esStoreList', JSON.stringify(this.esStoreList))
+  // this.initialData()
+  // }
+  // }
 
   deleteStore(_store, index) {
     this.esStoreList.splice(index)
@@ -170,10 +169,19 @@ export class EsApplyScanPage implements OnInit {
   // 保存并生成货号
   async saveStore() {
     // for (let i of this.esStoreList) {
-    await this.userData.saveStoreDetail(this.esStoreDetailList)
+    this.clicked = true
+    this.canSubmit = true
+    for (let i of this.esStoreDetailList) {
+      if (!i.outboxlength || !i.outboxwidth || !i.outboxheigt || !i.enterBoxs || !i.grossweight || !i.storelocation) {
+        this.canSubmit = false
+      }
+    }
+    if (this.canSubmit) {
+      this.userData.saveStoreDetail(this.esStoreDetailList)
+      this.initialData()
+    }
     // }
-    this.initialData()
-    this.esStoreList = []
+    // this.esStoreList = []
   }
 
   qrscan() {

src/app/menu/menu.ts

@@ -55,12 +55,12 @@ export const menu_list = [
         },
         {
             id: 8000,
-            name: '入库单号查询',
+            name: '申请单号',
             icon: 'appstore',
             url: 'es-apply-scan'
         }, {
             id: 9000,
-            name: '待备货',
+            name: '待抽箱',
             icon: 'timer',
             url: 'warehouse-manage-pending'
         }]

src/app/warehouse-manage-pending/warehouse-manage-pending.page.html

@@ -3,7 +3,7 @@
     <ion-buttons slot="start">
       <ion-menu-button></ion-menu-button>
     </ion-buttons>
-    <ion-title>待备货</ion-title>
+    <ion-title>待抽箱</ion-title>
   </ion-toolbar>
 </ion-header>
 
@@ -31,14 +31,14 @@
         <img slot="end" (click)="showFullScreenImage(warehouseManage)" [src]="warehouseManage.imgsrc" class="title-image" />
       </ion-item>
       <ion-item>
-        <ion-icon name="briefcase"></ion-icon>
+        <ion-icon name="logo-wordpress"></ion-icon>
         <ion-label>中文名：</ion-label>
         <ion-input [(ngModel)]='warehouseManage.scpCnname'></ion-input>
       </ion-item>
       <ion-item>
-        <ion-icon name="square"></ion-icon>
+        <ion-icon name="appstore"></ion-icon>
         <ion-label>我司货号：</ion-label>
-        <ion-input [(ngModel)]='warehouseManage.scpCode'></ion-input>
+        <ion-input [(ngModel)]='warehouseManage.scpCode' [color]="warehouseManage.showColor"></ion-input>
       </ion-item>
       <ion-item>
         <ion-icon name="square"></ion-icon>
@@ -46,18 +46,18 @@
         <ion-input [(ngModel)]="warehouseManage.checkcount" readonly></ion-input>
       </ion-item>
       <ion-item>
-        <ion-icon name="square"></ion-icon>
+        <ion-icon name="cube"></ion-icon>
         <ion-label>检验箱数： </ion-label>
         <ion-input [(ngModel)]="warehouseManage.checkboxcount" readonly></ion-input>
       </ion-item>
 
       <ion-item>
-        <ion-icon name="square"></ion-icon>
+        <ion-icon name="pin"></ion-icon>
         <ion-label>位置： </ion-label>
         <ion-input [(ngModel)]="warehouseManage.storelocation" readonly></ion-input>
       </ion-item>
       <ion-item>
-        <ion-icon name="square"></ion-icon>
+        <ion-icon name="person"></ion-icon>
         <ion-label>验货QC： </ion-label>
         <ion-input [(ngModel)]="warehouseManage.qcName" readonly></ion-input>
       </ion-item>
@@ -69,7 +69,7 @@
 
       <div class="ion-padding">
         <ion-button color="primary" type="submit" expand="block" (click)="prepareGoods(warehouseManage.sscId,warehouseManage.pid)">
-          备货完成</ion-button>
+          抽箱完成</ion-button>
       </div>
     </ion-card-content>
   </ion-card>

src/app/warehouse-manage-pending/warehouse-manage-pending.page.ts

@@ -54,6 +54,8 @@ export class WarehouseManagePendingPage implements OnInit {
       if (i.pictures && i.pictures.length !== 0) {
         i.imgsrc = i.pictures[0].smallPicture;
       }
+      // 控制货号高亮显示
+      i.showColor = i.checkboxcount/i.contractBoxs>=0.8?'success':i.checkboxcount/i.contractBoxs<=0.5?'danger':''
     }
   }