Dev

PMS/ClientApp/src/app/components/shared/loader/loader.component.scss

@@ -6,7 +6,7 @@
 
 .loader-overlay {
   opacity: 1;
-  z-index: 999;
+  z-index: 1001;
   width: 100%;
   height: 100%;
   background-color: rgba(255, 255, 255, 0.12);

PMS/ClientApp/src/app/pages/accounting/SNPE024_M/upload-modal/upload-modal.component.ts

@@ -84,8 +84,8 @@ export class SNPE024UploadModalComponent implements OnInit {
     let mergedList = originalDataCopy.map((original) => {
       const data = uploadData.find(
         (upload) =>
-          original["ITEM_NO"] === upload["ITEM NO"] &&
-          original["ACCEPT_PART_NO"] === upload["ACCEPT PART NO"]
+          parseFloat(original["ITEM_NO"]) == parseFloat(upload["ITEM NO"]) &&
+          original["ACCEPT_PART_NO"] == upload["ACCEPT PART NO"]
       );
       if (!data) failedCheck = true;
       if (!(parseFloat(data["UNIT PRICE B"]) > 0)) failedCheck = true;
@@ -113,6 +113,6 @@ export class SNPE024UploadModalComponent implements OnInit {
   }
 
   public CloseDialog(): void {
-    this.dialogRef.close();
+    this.dialogRef.close(this.data.DETAIL);
   }
 }

PMS/ClientApp/src/app/pages/inventory_control_common/SNSE148/SNSE148.component.html

@@ -73,7 +73,7 @@
         <button mat-raised-button color="primary" (click)="Export()">Export To Excel (add info from PMS)</button>
       </div>
       <div class="col-md-6" style="text-align:right;">
-        <button mat-raised-button color="primary" (click)="check()">Export To Excel (Order Modification To PMS)</button>
+        <button mat-raised-button color="primary" (click)="check()">Export To Excel (Order Modification To MPS)</button>
       </div>
     </div>
   </div>

PMS/ClientApp/src/app/pages/saleorder/SNSE042NA4/SNSE042NA4.component.ts

@@ -24,7 +24,7 @@ export class SNSE042NA4Component implements OnInit {
   public params: any = {};
 
   ngOnInit() {
-    this.InitData()
+/*    this.InitData()*/
   }
 
   public ConfigPickLotSeq: any = {