From 5ae6900f38713063c21c8985aafc8abbe8a77256 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 25 四月 2023 11:09:02 +0800
Subject: [PATCH] backup20230425

---
 force-app/main/default/classes/LexSaleAndDeliveryController.cls-meta.xml |    5 
 force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html          | 1316 ++++++++++++---
 force-app/main/default/classes/LexSaleAndDeliveryController.cls          |  233 ++
 force-app/main/default/classes/LexOverdueStockController.cls             |  393 ++++
 force-app/main/default/classes/LexOverdueStockController.cls-meta.xml    |    5 
 force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js            | 2295 ++++++++++++++++------------
 force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js            |  425 ++--
 manifest/packageForSign.xml                                              |    5 
 force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html          |  162 +
 9 files changed, 3,284 insertions(+), 1,555 deletions(-)

diff --git a/force-app/main/default/classes/LexOverdueStockController.cls b/force-app/main/default/classes/LexOverdueStockController.cls
new file mode 100644
index 0000000..4181649
--- /dev/null
+++ b/force-app/main/default/classes/LexOverdueStockController.cls
@@ -0,0 +1,393 @@
+public with sharing class LexOverdueStockController {
+    /*****************妞滅储鐢�******************/
+    public static String barcode { get; set; }
+
+    // 杩囨湡鍜岄攢瀛�,鐢婚潰鏄剧ず鐢�
+    public static List<orderBean> codPageRecords { get; set; }
+
+    // 杩囨湡鍜岄攢瀛�,鐢婚潰鏄剧ず鐢�
+    public static List<orderBean> overduePageRecords { get; set; }
+
+    // 鐧诲綍鑰呭伐浣滃湴
+    private static String userWorkLocation;
+    //缁忛攢鍟嗙敤鎴蜂骇鍝佸垎绫伙紙ET銆丒NG锛�
+    private static String agencyProType;
+    private static String sqlagencyProType;
+    // 缁忛攢鍟嗕俊鎭�
+    private static Account accountInfo;
+
+    //鍒ゆ柇鎿嶄綔浜哄憳鏄惁閿�瀛�
+    public static Boolean iSinventory = false;
+
+    public static List<Consumable_order_details2__c> overdueList = new List<Consumable_order_details2__c>();
+
+    public static Integer pageRecordsSize {
+        get {
+            return codPageRecords == null ? 0 : codPageRecords.size();
+        }
+    }
+
+    public LexOverdueStockController() {
+    }
+
+    // 鐢婚潰鍒濆鍖�
+    @AuraEnabled
+    public static ResponseBodyLWC init() {
+        ResponseBodyLWC res = new ResponseBodyLWC();
+        Map<String, object> data = new Map<String, object>();
+        res.entity = data;
+
+        codPageRecords = new List<orderBean>();
+        overduePageRecords = new List<orderBean>();
+        // 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
+        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
+        userWorkLocation = Useracc.Work_Location__c;
+        agencyProType = Useracc.UserPro_Type__c;
+        if (String.isBlank(Useracc.UserPro_Type__c)) {
+            agencyProType = 'ET';
+        }
+        sqlagencyProType = '%' + agencyProType + '%';
+        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
+        // 杩囨湡搴撳瓨姹囨�讳俊鎭�
+        List<AggregateResult> orderDetZaiku = [
+            SELECT count(Id) countsum, Consumable_Product__c prodid, Consumable_Product__r.Name_Text__c prodname, Box_Piece__c boxPiece
+            FROM Consumable_order_details2__c
+            WHERE
+                Dealer_Arrive__c = TRUE
+                AND Dealer_Shipment__c = FALSE
+                AND Dealer_Saled__c = FALSE
+                AND Lose_Flag__c = FALSE
+                AND Isoverdue__c = 0
+                AND Dealer_Returned__c = FALSE
+                AND Cancellation_Flag__c = FALSE
+                AND Bar_Code__c != NULL
+                AND Product_Type__c LIKE :sqlagencyProType
+                AND Dealer_Info_text__c = :accountInfo.Name
+                AND Arrive_Owner_Work_Location__c = :userWorkLocation
+            GROUP BY Consumable_Product__c, Box_Piece__c, Consumable_Product__r.Name_Text__c
+        ];
+
+        for (AggregateResult overdue : orderDetZaiku) {
+            codPageRecords.add(new orderBean(overdue));
+        }
+
+        system.debug('codPageRecords====>' + codPageRecords);
+        data.put('codPageRecords', JSON.serialize(codPageRecords));
+        data.put('userWorkLocation', userWorkLocation);
+        data.put('accountName', accountInfo.Name);
+        data.put('agencyProType', agencyProType);
+        data.put('orderDetZaiku', JSON.serialize(orderDetZaiku));
+        res.status = 'Success';
+        res.code = 200;
+        System.debug('res = ' + res);
+        return res;
+    }
+
+    // BarCode褰曞叆
+    @AuraEnabled
+    public static ResponseBodyLWC searchorderBean(
+        String agencyProTypeLWC,
+        String userWorkLocationLWC,
+        String accountNameLWC,
+        String barcodeLWC,
+        String codPageRecordsLWC
+    ) {
+        ResponseBodyLWC res = new ResponseBodyLWC();
+        Map<String, object> data = new Map<String, object>();
+        res.entity = data;
+        List<orderBean> codPageRecords = (List<orderBean>) JSON.deserialize(codPageRecordsLWC, List<orderBean>.class);
+        sqlagencyProType = '%' + agencyProTypeLWC + '%';
+        system.debug('sqlagencyProType==>' + sqlagencyProType);
+        barcode = barcodeLWC;
+        system.debug('barcode==>' + barcode);
+        userWorkLocation = userWorkLocationLWC;
+        // add by Wang Xueqin 2023/04/12
+        // 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
+        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
+        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
+
+        iSinventory = true;
+        Set<String> barCodeoverdue = new Set<String>();
+        overduePageRecords = new List<orderBean>();
+        List<String> barCodeListP = ParseBarCode(barcode);
+        // 椤甸潰鏄剧ず鏁版嵁鍒濆鍖�
+        for (orderBean codPage : codPageRecords) {
+            codPage.pandian = 0;
+        }
+        // 鏌ヨ鎵�鏈夎繃鏈熷簱瀛�
+        List<Consumable_order_details2__c> orderDetZaiku = [
+            SELECT
+                Id,
+                Name,
+                Consumable_Product__c,
+                Bar_Code__c,
+                Consumable_Product__r.Name__c,
+                Dealer_Info_text__c,
+                Asset_Model_No__c,
+                Isoverdue__c,
+                Box_Piece__c,
+                Sterilization_limit__c,
+                Bar_Code_search__c
+            FROM Consumable_order_details2__c
+            WHERE
+                Dealer_Arrive__c = TRUE
+                AND Dealer_Shipment__c = FALSE
+                AND Dealer_Saled__c = FALSE
+                AND Lose_Flag__c = FALSE
+                AND Isoverdue__c = 0
+                AND Dealer_Returned__c = FALSE
+                AND Cancellation_Flag__c = FALSE
+                AND Bar_Code__c != NULL
+                AND Product_Type__c LIKE :sqlagencyProType
+                AND Dealer_Info_text__c = :accountInfo.Name
+                AND Arrive_Owner_Work_Location__c = :userWorkLocation
+        ];
+        // 娌℃湁杈撳叆鏉$爜鏃讹紝寰幆椤甸潰锛屾墍鏈夋墦閽╀骇鍝佸叏閮ㄩ攢瀛�
+        // 鍙栧緱鎵�鏈�
+        overdueList = new List<Consumable_order_details2__c>();
+        if (String.isBlank(barcode)) {
+            System.debug('barcode绌�');
+            for (orderBean codPage : codPageRecords) {
+                if (codPage.check) {
+                    for (Consumable_order_details2__c cod2 : orderDetZaiku) {
+                        if (cod2.Consumable_Product__c == codPage.prodid && codPage.boxPiece == cod2.Box_Piece__c) {
+                            overduePageRecords.add(new orderBean(cod2, '杩囨湡搴撳瓨閿�瀛�'));
+                            overdueList.add(cod2);
+                        }
+                    }
+                    codPage.pandian = codPage.overlimitCount;
+                }
+            }
+            // return;
+            System.debug('overdueList===>' + overdueList);
+            System.debug('overduePageRecords====>' + overduePageRecords);
+            data.put('overdueList', JSON.serialize(overdueList));
+            data.put('overduePageRecords', JSON.serialize(overduePageRecords));
+            data.put('codPageRecords', JSON.serialize(codPageRecords));
+            data.put('iSinventory', iSinventory);
+            res.status = 'Success';
+            res.code = 200;
+            res.msg = '鎵�鏈夋墦鍕句骇鍝侀攢瀛樻垚鍔�';
+            System.debug('res = ' + res);
+            return res;
+        }
+
+        // 杈撳叆barcode鏃�
+
+        // BarCode鐨勬绱�  鎵�鏈夊湪搴�
+        List<Consumable_order_details2__c> reSet = [
+            SELECT
+                Id,
+                Consumable_Product__c,
+                Consumable_Product__r.Name__c,
+                Box_Piece__c,
+                Bar_Code_search__c,
+                Dealer_Shipment__c,
+                Dealer_Saled__c,
+                Lose_Flag__c,
+                Bar_Code__c,
+                Cancellation_Flag__c,
+                Isoverdue__c,
+                Sterilization_limit__c
+            FROM Consumable_order_details2__c
+            WHERE
+                Bar_Code_search__c IN :BarCodeListP
+                AND Dealer_Arrive__c = TRUE
+                AND Cancellation_Flag__c = FALSE
+                AND Dealer_Returned__c = FALSE
+                AND Bar_Code__c != NULL
+                AND Product_Type__c LIKE :sqlagencyProType
+                AND Arrive_Owner_Work_Location__c = :userWorkLocation
+                AND Dealer_Info_text__c = :accountInfo.Name
+            ORDER BY Name
+        ];
+
+        System.debug('reSet===>' + reSet);
+
+        for (Consumable_order_details2__c cod2 : reSet) {
+            if (
+                (cod2.Dealer_Shipment__c == false &&
+                cod2.Dealer_Saled__c == false &&
+                cod2.Lose_Flag__c == false &&
+                cod2.Cancellation_Flag__c == false) && cod2.Isoverdue__c == 0
+            ) {
+                for (orderBean codPage : codPageRecords) {
+                    if (cod2.Consumable_Product__c == codPage.prodid && cod2.Box_Piece__c == codPage.boxPiece) {
+                        overduePageRecords.add(new orderBean(cod2, '杩囨湡搴撳瓨閿�瀛�'));
+                        overdueList.add(cod2);
+                        codPage.pandian++;
+                        codPage.check = true;
+                    }
+                }
+            } else if (cod2.Dealer_Shipment__c || cod2.Dealer_Saled__c) {
+                overduePageRecords.add(new orderBean(cod2, '浜у搧宸茬粡鍑哄簱'));
+            } else {
+                overduePageRecords.add(new orderBean(cod2, '涓嶆槸杩囨湡搴撳瓨'));
+            }
+        }
+        System.debug('overduePageRecords = ' + overduePageRecords);
+        data.put('overduePageRecords', JSON.serialize(overduePageRecords));
+        data.put('codPageRecords', JSON.serialize(codPageRecords));
+        data.put('iSinventory', iSinventory);
+        data.put('overdueList', overdueList);
+        res.status = 'Success';
+        res.code = 200;
+        System.debug('res = ' + res);
+        return res;
+    }
+
+    // 淇濆瓨鎸夐挳
+    @AuraEnabled
+    public static ResponseBodyLWC save(Boolean iSinventory, string saveCodPageRecords, String saveoverdueList) {
+        ResponseBodyLWC res = new ResponseBodyLWC();
+        Map<String, object> data = new Map<String, object>();
+        res.entity = data;
+        system.debug('saveCodPageRecords=============>' + saveCodPageRecords);
+        List<orderBean> codPageRecords = (List<orderBean>) JSON.deserialize(saveCodPageRecords, List<orderBean>.class);
+        List<Consumable_order_details2__c> overdueList = (List<Consumable_order_details2__c>) JSON.deserialize(
+            saveoverdueList,
+            List<Consumable_order_details2__c>.class
+        );
+
+        // add by Wang Xueqin 2023/04/12
+        // 鑾峰彇鐢ㄦ埛鍜岀粡閿�鍟嗕俊鎭�
+        user Useracc = [SELECT Accountid, Work_Location__c, UserPro_Type__c FROM user WHERE id = :UserInfo.getUserId()];
+        accountInfo = [SELECT id, Name, Dealer_discount__c FROM account WHERE id = :Useracc.accountid];
+
+        // 璺宠繃鏄庣粏2涓嶅繀瑕佹洿鏂�
+        StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
+        if (!iSinventory) {
+            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'璇峰厛鐐广�怋arCode褰曞叆銆�'));
+            return new ResponseBodyLWC('Error', 500, '璇峰厛鐐广�怋arCode褰曞叆銆�', '');
+            // return null;
+        }
+        integer Lo = 0;
+        for (orderBean header : codPageRecords) {
+            if (header.check == true) {
+                Lo++;
+            }
+        }
+        if (Lo == 0) {
+            iSinventory = false;
+            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'璇烽�夋嫨瑕侀攢瀛樼殑鏄庣粏銆�'));
+            return new ResponseBodyLWC('Error', 500, '璇烽�夋嫨瑕侀攢瀛樼殑鏄庣粏', '');
+            // return null;
+        }
+        Integer orderDetNo = 1;
+        Savepoint sp = Database.setSavepoint();
+        Consumable_order__c po = new Consumable_order__c();
+        po.Name = '*';
+        po.Order_status__c = '鎵瑰噯';
+        po.Inventory_date__c = Date.today();
+        po.Order_type__c = '閿�瀛�';
+        po.Dealer_Info__c = accountInfo.Id;
+        po.Order_ProType__c = agencyProType;
+        po.RecordTypeid = System.Label.RT_ConOrder_Overdue;
+        try {
+            insert po;
+            Consumable_order__c order = [SELECT Name FROM Consumable_order__c WHERE id = :po.id];
+            List<Consumable_orderdetails__c> InsList = new List<Consumable_orderdetails__c>();
+            for (orderBean header : codPageRecords) {
+                if (header.check == true) {
+                    Consumable_orderdetails__c insPan = new Consumable_orderdetails__c();
+                    String str = string.valueOf(orderDetNo);
+                    if (str.length() == 1) {
+                        str = '0' + str;
+                    }
+                    insPan.Name = order.Name + '-' + str;
+                    insPan.Consumable_Product__c = header.prodId;
+                    insPan.Consumable_order__c = po.Id;
+                    insPan.Lose_reason__c = '杩囨湡搴撳瓨閿�瀛�';
+                    insPan.Overdue_count__c = header.pandian;
+                    insPan.Overdue_SUM__c = header.overlimitCount;
+                    insPan.RecordTypeId = System.Label.RT_ConOrderDetail1_Inventory;
+                    orderDetNo++;
+                    InsList.add(insPan);
+                }
+            }
+            // 鐢熸垚鏄庣粏1
+            if (InsList.size() > 0) {
+                insert InsList;
+            }
+
+            for (Consumable_order_details2__c cod : overdueList) {
+                cod.Consumable_Inventory_order__c = po.Id;
+                cod.Inventory_date__c = Date.today();
+                cod.Lose_reason__c = '杩囨湡搴撳瓨閿�瀛�';
+                cod.Lose_Flag__c = true;
+            }
+            if (overdueList.size() > 0) {
+                ControllerUtil.updateOrderDetailsSatus(overdueList);
+            }
+        } catch (Exception ex) {
+            Database.rollback(sp);
+            ApexPages.addMessages(ex);
+            return null;
+        }
+        // return new Pagereference('/' + po.Id);
+        data.put('Id', po.Id);
+        res.status = 'Success';
+        res.code = 200;
+        System.debug('res = ' + res);
+        return res;
+    }
+
+    // 灏嗛〉闈㈡垨鍙栧緱BarCode鍘绘帀閲嶅鐨勶紝杞崲鎴怢ist
+    public static List<String> ParseBarCode(String Code) {
+        Map<String, Integer> barcodeCountMap = new Map<String, Integer>();
+        String[] Cache = new List<String>{};
+        Cache = Code.split('\n');
+        List<String> Buff = new List<String>();
+        for (String A : Cache) {
+            A = A.trim().toUpperCase();
+            if (barcodeCountMap.containsKey(A)) {
+                barcodeCountMap.put(A, barcodeCountMap.get(A) + 1);
+            } else {
+                barcodeCountMap.put(A, 1);
+            }
+            Buff.add(A + barcodeCountMap.get(A));
+        }
+        return Buff;
+    }
+
+    // Data Bean
+    class orderBean implements Comparable {
+        public Consumable_order_details2__c orderdetails2 { get; set; }
+        public Product2__c Prod { get; set; }
+        public Boolean check { get; set; }
+        // 杩囨湡搴撳瓨
+        public Integer overlimitCount { get; set; }
+        // 閿�瀛樻暟閲�
+        public Integer pandian { get; set; }
+        // 閿�瀛樺師鍥�
+        public String diffReason { get; set; }
+        // 鍗曚綅
+        public String boxPiece { get; set; }
+        public String prodname { get; set; }
+        public String prodid { get; set; }
+        orderBean(Consumable_order_details2__c e, string str) {
+            orderdetails2 = e;
+            Prod = e.Consumable_Product__r;
+            DiffReason = str;
+        }
+        public orderBean(AggregateResult e) {
+            check = false;
+            overlimitCount = Integer.valueOf(e.get('countsum'));
+            prodname = String.valueOf(e.get('prodname'));
+            prodid = String.valueOf(e.get('prodid'));
+            boxPiece = String.valueOf(e.get('BoxPiece'));
+            pandian = 0;
+        }
+        // 鎺掑簭
+        public Integer compareTo(Object compareTo) {
+            orderBean compareToesd = (orderBean) compareTo;
+            Integer returnValue = 0;
+            if (overlimitCount > compareToesd.overlimitCount) {
+                returnValue = -1;
+            } else if (overlimitCount < compareToesd.overlimitCount) {
+                returnValue = 1;
+            }
+            return returnValue;
+        }
+    }
+}
diff --git a/force-app/main/default/classes/LexOverdueStockController.cls-meta.xml b/force-app/main/default/classes/LexOverdueStockController.cls-meta.xml
new file mode 100644
index 0000000..1248daa
--- /dev/null
+++ b/force-app/main/default/classes/LexOverdueStockController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>56.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/LexSaleAndDeliveryController.cls b/force-app/main/default/classes/LexSaleAndDeliveryController.cls
new file mode 100644
index 0000000..9a385f2
--- /dev/null
+++ b/force-app/main/default/classes/LexSaleAndDeliveryController.cls
@@ -0,0 +1,233 @@
+public with sharing class LexSaleAndDeliveryController {
+    // 鏄剧ず鏁版嵁鏉℃暟闄愬埗
+    private static Integer Select_Limit = 100;
+
+    //鍒濆鍖�
+    @AuraEnabled
+    public static ResponseBodyLWC init() {
+        try {
+            System.debug('init');
+            //缁忛攢鍟唅d
+            String accountid = '';
+            //缁忛攢鍟嗕骇鍝佸垎绫�
+            String agencyProType = '';
+            //鐧诲綍鐢ㄦ埛 ID
+            String userinfoId = '';
+            //鐧诲綍鑰呭伐浣滃湴
+            String userWorkLocation = '';
+
+            ResponseBodyLWC res = new ResponseBodyLWC();
+            Map<String, object> data = new Map<String, object>();
+            res.entity = data;
+            userinfoId = UserInfo.getUserId();
+            List<user> Useracc = new List<user>();
+            Useracc = [
+                SELECT accountid, Work_Location__c, UserPro_Type__c
+                FROM user
+                WHERE id = :userinfoId
+            ];
+            accountid = Useracc[0].accountid;
+            agencyProType = Useracc[0].UserPro_Type__c;
+            if (String.isBlank(Useracc[0].UserPro_Type__c)) {
+                agencyProType = 'ET';
+            }
+            userWorkLocation = Useracc[0].Work_Location__c;
+            data.put('userinfoId', userinfoId);
+            data.put('accountid', accountid);
+            data.put('agencyProType', agencyProType);
+            data.put('userWorkLocation', userWorkLocation);
+            System.debug(
+                'userinfoId = ' +
+                    userinfoId +
+                    ' accountid = ' +
+                    accountid +
+                    ' agencyProType = ' +
+                    agencyProType +
+                    ' userWorkLocation = ' +
+                    userWorkLocation
+            );
+            //榛樿妫�绱㈡樉绀烘湭瀹屾垚鐨勬寚绀哄崟
+            List<Consumable_order__c> raesList = new List<Consumable_order__c>();
+            String soql = 'select Id, Name,ShipmentAccount__c,SummonsStatus_c__c,Billed_Status__c,CreatedDate,Outbound_Date__c,Order_ForCustomerText__c,InvoiceNotPro_total_amount__c,InvoiceNotPro_money__c from Consumable_order__c';
+            soql += '  WHERE Order_type__c = \'' + '浼犵エ' + '\'  ';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            soql += 'and SummonsStatus_c__c != \'' + '宸插畬鎴�' + '\' and Dealer_Info__c =\'' + accountid + '\' ';
+            soql += 'and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
+            soql += 'order by SummonsStatus_c__c';
+            System.debug('soql = ' + soql);
+            raesList = Database.query(soql);
+            System.debug('raesList = ' + raesList);
+            data.put('raesList', raesList);
+            res.status = 'Success';
+            res.code = 200;
+            res.msg = '';
+            return res;
+        } catch (Exception e) {
+            return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
+        }
+    }
+
+    // 宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�
+    @AuraEnabled
+    public static ResponseBodyLWC searchOrderInstatus(
+        String orderDate,
+        String deliverDate,
+        String accountid,
+        String agencyProType,
+        String userWorkLocation,
+        String category1,
+        String category2
+    ) {
+        try {
+            ResponseBodyLWC res = new ResponseBodyLWC();
+            Map<String, object> data = new Map<String, object>();
+            res.entity = data;
+
+            Date cate2 = String.isEmpty(orderDate) ? null : Date.valueOf(orderDate.replace('/', '-'));
+            Date cate3 = String.isEmpty(deliverDate) ? null : Date.valueOf(deliverDate.replace('/', '-'));
+            // 鑾峰緱璁㈠崟涓�瑙�
+            List<Consumable_order__c> raesList = new List<Consumable_order__c>();
+            String soql = 'select Id, Name,ShipmentAccount__c,SummonsStatus_c__c,Billed_Status__c,CreatedDate,Outbound_Date__c,Order_ForCustomerText__c,InvoiceNotPro_total_amount__c,InvoiceNotPro_money__c from Consumable_order__c';
+            soql += ' WHERE   Order_type__c = \'' + '浼犵エ' + '\' ';
+            soql += ' and Dealer_Info__c =\'' + accountid + '\' ';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
+            if (!String.isBlank(category1)) {
+                soql += ' and Name like \'%' + String.escapeSingleQuotes(category1.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (!String.isBlank(category2)) {
+                soql += ' and ShipmentAccount__c like \'%' + String.escapeSingleQuotes(category2.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (cate2 != null) {
+                soql += ' and Outbound_Date__c >= :cate2 ';
+            }
+            if (cate3 != null) {
+                soql += ' and Outbound_Date__c <= :cate3 ';
+            }
+            soql += 'and SummonsForDirction__c != \'' + '浜掔浉璋冭揣' + '\' ';
+            soql += 'and SummonsStatus_c__c = \'' + '宸插畬鎴�' + '\' ';
+            soql += 'and Billed_Status__c != \'' + '鍏ㄩ儴寮�绁�' + '\' ';
+            soql += 'order by CreatedDate desc limit ' + Select_Limit;
+            System.debug('soql = ' + soql);
+            raesList = Database.query(soql);
+            data.put('raesList', raesList);
+            if (raesList.size() > 0) {
+                res.msg = '鍏辨湁' + raesList.size() + '涓嚭搴撳崟';
+            } else {
+                res.msg = '娌℃湁鎼滅储鍒扮浉鍏冲嚭搴撳崟銆�';
+            }
+            res.status = 'Success';
+            res.code = 200;
+            return res;
+        } catch (Exception e) {
+            return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
+        }
+    }
+
+    //杩樻病鍑哄簱鐨勫嚭搴撳崟
+    @AuraEnabled
+    public static ResponseBodyLWC searchConsumableorderdetails(
+        String orderDate,
+        String deliverDate,
+        String accountid,
+        String agencyProType,
+        String userWorkLocation,
+        String category1,
+        String category2
+    ) {
+        try {
+            ResponseBodyLWC res = new ResponseBodyLWC();
+            Map<String, object> data = new Map<String, object>();
+            res.entity = data;
+            Date cate2 = String.isEmpty(orderDate) ? null : Date.valueOf(orderDate.replace('/', '-'));
+            Date cate3 = String.isEmpty(deliverDate) ? null : Date.valueOf(deliverDate.replace('/', '-'));
+            // 鑾峰緱璁㈠崟涓�瑙�
+            List<Consumable_order__c> raesList = new List<Consumable_order__c>();
+            String soql = 'select Id, Name,ShipmentAccount__c,SummonsStatus_c__c,Billed_Status__c,CreatedDate,Outbound_Date__c,Order_ForCustomerText__c,InvoiceNotPro_total_amount__c,InvoiceNotPro_money__c from Consumable_order__c';
+            soql += ' WHERE   Order_type__c = \'' + '浼犵エ' + '\' ';
+            soql += ' and Dealer_Info__c =\'' + accountid + '\' ';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
+            if (!String.isBlank(category1)) {
+                soql += ' and Name like \'%' + String.escapeSingleQuotes(category1.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (!String.isBlank(category2)) {
+                soql += ' and ShipmentAccount__c like \'%' + String.escapeSingleQuotes(category2.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (cate2 != null) {
+                soql += ' and Order_date__c >= :cate2 ';
+            }
+            if (cate3 != null) {
+                soql += ' and Order_date__c <= :cate3 ';
+            }
+            soql += 'and SummonsStatus_c__c != \'' + '宸插畬鎴�' + '\' ';
+            soql += 'order by SummonsStatus_c__c limit ' + Select_Limit;
+            System.debug('soql+++++' + soql);
+            raesList = Database.query(soql);
+            data.put('raesList', raesList);
+            if (raesList.size() > 0) {
+                res.msg = '鍏辨湁' + raesList.size() + '涓嚭搴撳崟';
+            } else {
+                res.msg = '娌℃湁鎼滅储鍒扮浉鍏冲嚭搴撳崟銆�';
+            }
+            res.status = 'Success';
+            res.code = 200;
+            return res;
+        } catch (Exception e) {
+            return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
+        }
+    }
+
+    // 宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
+    @AuraEnabled
+    public static ResponseBodyLWC searchConsumableorFinish(
+        String orderDate,
+        String deliverDate,
+        String accountid,
+        String agencyProType,
+        String userWorkLocation,
+        String category1,
+        String category2
+    ) {
+        try {
+            ResponseBodyLWC res = new ResponseBodyLWC();
+            Map<String, object> data = new Map<String, object>();
+            res.entity = data;
+            Date cate2 = String.isEmpty(orderDate) ? null : Date.valueOf(orderDate.replace('/', '-'));
+            Date cate3 = String.isEmpty(deliverDate) ? null : Date.valueOf(deliverDate.replace('/', '-'));
+            List<Consumable_order__c> raesList = new List<Consumable_order__c>();
+            String soql = 'select Id, Name,ShipmentAccount__c,SummonsStatus_c__c,Billed_Status__c,CreatedDate,Outbound_Date__c,Order_ForCustomerText__c,InvoiceNotPro_total_amount__c,InvoiceNotPro_money__c from Consumable_order__c';
+            soql += ' WHERE   Order_type__c = \'' + '浼犵エ' + '\' ';
+            soql += ' and Dealer_Info__c =\'' + accountid + '\' ';
+            soql += ' and Order_ProType__c =\'' + agencyProType + '\' ';
+            soql += ' and Order_Owner_WorkLocal__c = \'' + userWorkLocation + '\' ';
+            if (!String.isBlank(category1)) {
+                soql += ' and Name like \'%' + String.escapeSingleQuotes(category1.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (!String.isBlank(category2)) {
+                soql += ' and ShipmentAccount__c like \'%' + String.escapeSingleQuotes(category2.replaceAll('%', '\\%')) + '%\' ';
+            }
+            if (cate2 != null) {
+                soql += ' and Outbound_Date__c >= :cate2 ';
+            }
+            if (cate3 != null) {
+                soql += ' and Outbound_Date__c <= :cate3 ';
+            }
+            soql += 'and SummonsStatus_c__c = \'' + '宸插畬鎴�' + '\' ';
+            soql += 'and Billed_Status__c = \'' + '鍏ㄩ儴寮�绁�' + '\' ';
+            soql += 'order by CreatedDate desc limit ' + Select_Limit;
+            raesList = Database.query(soql);
+            data.put('raesList', raesList);
+            if (raesList.size() > 0) {
+                res.msg = '鍏辨湁' + raesList.size() + '涓嚭搴撳崟';
+            } else {
+                res.msg = '娌℃湁鎼滅储鍒扮浉鍏冲嚭搴撳崟銆�';
+            }
+            res.status = 'Success';
+            res.code = 200;
+            return res;
+        } catch (Exception e) {
+            return new ResponseBodyLWC('Error', 500, e.getMessage(), '');
+        }
+    }
+}
diff --git a/force-app/main/default/classes/LexSaleAndDeliveryController.cls-meta.xml b/force-app/main/default/classes/LexSaleAndDeliveryController.cls-meta.xml
new file mode 100644
index 0000000..1248daa
--- /dev/null
+++ b/force-app/main/default/classes/LexSaleAndDeliveryController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>56.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
index 8677e61..605212e 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
@@ -2,19 +2,43 @@
     <template if:true={showSpinner}>
         <lightning-spinner size="medium" variant="brand"></lightning-spinner>
     </template>
-    <div style="border: 1px solid #D4D4D4;border-radius:5px;"> 
-        <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+    <div style="border: 1px solid #d4d4d4; border-radius: 5px">
+        <div
+            style="
+                border-top: 3px solid #51606e;
+                border-bottom: 1px solid #d4d4d4;
+                padding: 3px;
+            "
+        >
             <div>
-                <p style="font-size: 19px;float:left"><strong>杩囨湡搴撳瓨閿�瀛�</strong></p>
+                <p style="font-size: 19px; float: left">
+                    <strong>杩囨湡搴撳瓨閿�瀛�</strong>
+                </p>
             </div>
-            <div style="margin-left:400px;">
-                <lightning-button label="閿�瀛樼‘璁�" title="閿�瀛樼‘璁�" onclick={saveConfirm}></lightning-button>
+            <div style="margin-left: 400px">
+                <lightning-button
+                    label="閿�瀛樼‘璁�"
+                    title="閿�瀛樼‘璁�"
+                    onclick={saveConfirm}
+                ></lightning-button>
             </div>
         </div>
 
-        <div style="padding:10px;">
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+        <div style="padding: 10px">
+            <div
+                style="
+                    border: 1px solid #d4d4d4;
+                    border-radius: 5px;
+                    margin-bottom: 7px;
+                "
+            >
+                <div
+                    style="
+                        border-top: 3px solid #51606e;
+                        border-bottom: 1px solid #d4d4d4;
+                        padding: 3px;
+                    "
+                >
                     <table>
                         <colgroup>
                             <col width="160px" />
@@ -35,13 +59,23 @@
                         <tbody>
                             <tr>
                                 <td></td>
-                                <td align="right">Barcode</td>
-                                <td style="width:600px"><lightning-textarea name="Barcode" label=""
-                                        onchange={handleChange}></lightning-textarea></td>
+                                <td align="right">BarCode</td>
+                                <td style="width: 600px">
+                                    <lightning-textarea
+                                        name="BarCode"
+                                        label=""
+                                        onchange={handleChange}
+                                    ></lightning-textarea>
+                                </td>
                                 <td align="right"></td>
                                 <td></td>
-                                <td><lightning-button label="Barcode" title="Barcode褰曞叆" onclick={barcodeEntrys}
-                                        style="width: 150px;"></lightning-button>
+                                <td style="width: 200px">
+                                    <lightning-button
+                                        label="BarCode褰曞叆"
+                                        title="BarCode褰曞叆"
+                                        onclick={barcodeEntrys}
+                                        style="width: 150px"
+                                    ></lightning-button>
                                 </td>
                             </tr>
                         </tbody>
@@ -49,61 +83,89 @@
                 </div>
             </div>
 
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                    <p style="font-size: 16px;"><strong>杩囨湡搴撳瓨涓�瑙�</strong></p>
+            <div
+                style="
+                    border: 1px solid #d4d4d4;
+                    border-radius: 5px;
+                    margin-bottom: 7px;
+                "
+            >
+                <div
+                    style="
+                        border-top: 3px solid #51606e;
+                        border-bottom: 1px solid #d4d4d4;
+                        padding: 3px;
+                    "
+                >
+                    <p style="font-size: 16px"><strong>杩囨湡搴撳瓨涓�瑙�</strong></p>
                 </div>
-                <div style="padding:10px;">
-
-                    <div style="height: 300px;">
+                <div style="padding: 10px">
+                    <div style="height: 300px">
                         <template if:true={showTable}>
-
-                            <c-lex-custom-lightning-datatable key-field="prodid" data={data} columns={columns}
-                            onrowselection={getSelectedRows}
-                            selected-rows={selectedRows}>
-                                </c-lex-custom-lightning-datatable>
+                            <c-lex-custom-lightning-datatable
+                                key-field="prodid"
+                                data={data}
+                                columns={columns}
+                                onrowselection={getSelectedRows}
+                                selected-rows={selectedRows}
+                            >
+                            </c-lex-custom-lightning-datatable>
                         </template>
                         <!-- 鍔犺浇妗� -->
 
-                           <!-- <div if:true={casesSpinner} class="slds-spinner_inline spinner-padding"
+                        <!-- <div if:true={casesSpinner} class="slds-spinner_inline spinner-padding"
                             style="margin-top:10px;">
                             <lightning-spinner variant="brand" alternative-text="Loading Cases" size="medium">
                             </lightning-spinner>
                         </div> -->
-
                     </div>
-
                 </div>
             </div>
         </div>
 
-      
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:50px">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                    <table>
-                        <tr>
-                            <td>
-                                <p style="font-size: 16px;"><strong>閿�瀛樻槑缁�</strong></p>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
- 
-            <div style="padding:10px;">
-                <template if:true={showTables}>
-                    <!-- <c-lwc-datatable-utility records={overduePageRecords} total-records={overduePageRecords.length}
-                        columns={column} key-field="Id" show-search-box="true" max-row-selection={overduePageRecords.length}
-                        onpaginatorchange={handlePaginatorChange}>
-                    </c-lwc-datatable-utility> -->
+        <div
+            style="
+                border: 1px solid #d4d4d4;
+                border-radius: 5px;
+                margin-bottom: 7px;
+                margin-top: 50px;
+            "
+        >
+            <div
+                style="
+                    border-top: 3px solid #51606e;
+                    border-bottom: 1px solid #d4d4d4;
+                    padding: 3px;
+                "
+            >
+                <table>
+                    <tr>
+                        <td>
+                            <p style="font-size: 16px">
+                                <strong>閿�瀛樻槑缁�</strong>
+                            </p>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+
+            <div style="padding: 10px">
+                <lightning-datatable
+                    key-field="id"
+                    data={overduePageRecords}
+                    columns={column}
+                    onrowselection={getSelectedRows}
+                    hide-checkbox-column="true"
+                    selected-rows={selectedRows}
+                >
+                </lightning-datatable>
+                <!-- <template if:true={showTables}>
                     <c-lex-custom-lightning-datatable key-field="prodid" data={overduePageRecords} columns={column}
                     onrowselection={getSelectedRows}   hide-checkbox-column="true"
                    selected-rows={selectedRows}>
                </c-lex-custom-lightning-datatable>
-                </template>
-
-
+                </template> -->
             </div>
         </div>
     </div>
-    
-</template>
\ No newline at end of file
+</template>
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
index d066ce8..a3786db 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
@@ -5,261 +5,266 @@
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import { NavigationMixin } from 'lightning/navigation';
 
-
 //杩囨湡搴撳瓨涓�瑙�
 const columns = [
     {
-      label: '鏄惁鐩樼偣',
-      fieldName: 'iscount',
-      type: 'checkbox',
-      hideDefaultActions: true,
-      initialWidth: 250,
+        label: '鏄惁閿�瀛�',
+        fieldName: 'iscount',
+        type: 'checkbox',
+        hideDefaultActions: true
+        // initialWidth: 250,
     },
     {
-      label: '娑堣�楀搧鍚嶇О',
-      fieldName: 'prodname',
-      type: 'prodname',
-      initialWidth: 350,
-      hideDefaultActions: true
-
+        label: '娑堣�楀搧鍚嶇О',
+        fieldName: 'prodname',
+        type: 'prodname',
+        // initialWidth: 350,
+        hideDefaultActions: true
     },
     {
-      label: '鍗曚綅',
-      fieldName: 'boxPiece',
-      hideDefaultActions: true,
-      initialWidth: 250,
-    
+        label: '鍗曚綅',
+        fieldName: 'boxPiece',
+        hideDefaultActions: true,
+        initialWidth: 250
     },
     {
-      label: '杩囨湡鏁伴噺',
-      fieldName: 'overlimitCount',
-      hideDefaultActions: true,
-      initialWidth: 250,
-    
+        label: '杩囨湡鏁伴噺',
+        fieldName: 'overlimitCount',
+        hideDefaultActions: true,
+        initialWidth: 250
     },
     {
-      label: '閿�瀛樻暟閲�',
-      fieldName: 'pandian',
-      hideDefaultActions: true,
-      initialWidth: 250,
-    //   cellAttributes: { alignment: 'center' }
+        label: '閿�瀛樻暟閲�',
+        fieldName: 'pandian',
+        hideDefaultActions: true,
+        initialWidth: 250
+        //   cellAttributes: { alignment: 'center' }
     }
-  ];
-  //杩囨湡搴撳瓨涓�瑙�
+];
+//閿�瀛樻槑缁�
 const column = [
- 
     {
-      label: '娑堣�楀搧鍚嶇О',
-      fieldName: 'Name__c',
-      type: 'Name',
-      initialWidth : 300,
-      hideDefaultActions: true,
-      cellAttributes: { alignment: 'left' }
+        label: '娑堣�楀搧鍚嶇О',
+        fieldName: 'Name__c',
+        type: 'Name',
+        // initialWidth : 300,
+        hideDefaultActions: true,
+        cellAttributes: { alignment: 'left' }
     },
     {
-      label: '鍗曚綅',
-      fieldName: 'Box_Piece__c',
-      initialWidth : 250,
-      hideDefaultActions: true
+        label: '鍗曚綅',
+        fieldName: 'Box_Piece__c',
+        initialWidth: 250,
+        hideDefaultActions: true
     },
     {
-      label: 'BarCode',
-      fieldName: 'Bar_Code__c',
-      hideDefaultActions: true,
-      initialWidth : 250
+        label: 'BarCode',
+        fieldName: 'Bar_Code__c',
+        hideDefaultActions: true,
+        initialWidth: 250
     },
     {
-      label: '浣跨敤鏈熼檺',
-      fieldName: 'Sterilization_limit__c',
-      hideDefaultActions: true,
-      initialWidth : 250
+        label: '浣跨敤鏈熼檺',
+        fieldName: 'Sterilization_limit__c',
+        hideDefaultActions: true,
+        initialWidth: 250
+    },
+    {
+        label: '閿�瀛樺師鍥�',
+        fieldName: 'diffReason',
+        hideDefaultActions: true,
+        initialWidth: 100
     }
-    ,
-    {
-      label: '閿�瀛樺師鍥�',
-      fieldName: 'diffReason',
-      hideDefaultActions: true,
-      initialWidth: 100
-    }
-  ];
+];
 
-
-export default class LexOverdueStock extends NavigationMixin (LightningElement ){
-    columns = columns
-    column = column
-    @track data =[];
+export default class LexOverdueStock extends NavigationMixin(LightningElement) {
+    columns = columns;
+    column = column;
+    @track data = [];
     @track overduePageRecords = [];
-    @track iSinventory = false
-  
+    @track iSinventory = false;
 
     //鍔犺浇妗�
     // @track casesSpinner = true;
-    @track showSpinner =true;
+    @track showSpinner = true;
     //鏄剧ず鍙�
-    @track showbutton = false
+    @track showbutton = false;
     @track showTable = false;
     @track showTables = false;
     //閿�瀛樹竴瑙堟暟鎹�
-    @track accountName
-    @track agencyProType
-    @track userWorkLocation
-    @track barcode = ''
-    @track orderDetZaiku
+    @track accountName;
+    @track agencyProType;
+    @track userWorkLocation;
+    @track barcode = '';
+    @track orderDetZaiku;
     @track selectedRows = [];
-    @track codPageRecordsLWC
-    @track Id
-
+    @track codPageRecordsLWC;
+    @track Id;
+    @track overdueList = [];
 
     //鍒濆鍖�
     connectedCallback() {
         console.log('鍒濆鍖�');
         this.showSpinner = true;
 
-        init().then((result) => {
-            result = JSON.parse(JSON.stringify(result));
-            console.log('result ='+JSON.stringify(result));
-            console.log('result 1='+result.entity.codPageRecords);
-            if(result.status = 'Success'){
-                this.data = JSON.parse(result.entity.codPageRecords);
-                this.codPageRecordsLWC = result.entity.codPageRecords;
-                console.log('this.data'+this.data);
-                this.accountName = result.entity.accountName;
-                this.agencyProType = result.entity.agencyProType;
-                this.userWorkLocation = result.entity.userWorkLocation;
-                this.showTable = true;
-                // this.casesSpinner = false;
-                this.showSpinner = false;
-            }else {
-                console.log('Error:' + result.errorMsg);
-                const evt = new ShowToastEvent({
-                  title: '瑙f瀽澶辫触',
-                  message: result.errorMsg,
-                  variant: 'error'
-                });
-                this.dispatchEvent(evt);
-              }
-        }).catch((error) => {
-            console.log('error = ' + JSON.stringify(error));
-          });
+        init()
+            .then((result) => {
+                result = JSON.parse(JSON.stringify(result));
+                console.log('result =' + JSON.stringify(result));
+                console.log('result 1=' + result.entity.codPageRecords);
+                if ((result.status = 'Success')) {
+                    this.data = JSON.parse(result.entity.codPageRecords);
+                    this.codPageRecordsLWC = result.entity.codPageRecords;
+                    console.log('this.data' + this.data);
+                    this.accountName = result.entity.accountName;
+                    this.agencyProType = result.entity.agencyProType;
+                    this.userWorkLocation = result.entity.userWorkLocation;
+                    this.showTable = true;
+                    // this.casesSpinner = false;
+                    this.showSpinner = false;
+                } else {
+                    console.log('Error:' + result.errorMsg);
+                    const evt = new ShowToastEvent({
+                        title: '瑙f瀽澶辫触',
+                        message: result.errorMsg,
+                        variant: 'error'
+                    });
+                    this.dispatchEvent(evt);
+                }
+            })
+            .catch((error) => {
+                console.log('error = ' + JSON.stringify(error));
+            });
     }
     //barcode褰曞叆
-    barcodeEntrys(){
+    barcodeEntrys() {
         this.showSpinner = true;
         this.showTable = false;
-        console.log('code'+this.barcode);
-        console.log(' this.accountName'+ this.accountName);
+        console.log('code' + this.barcode);
+        console.log(' this.accountName' + this.accountName);
         barcodeEntry({
             accountNameLWC: this.accountName,
             agencyProTypeLWC: this.agencyProType,
-            userWorkLocationLWC:this.userWorkLocation,
-            barcodeLWC:this.barcode,
-            codPageRecordsLWC:this.codPageRecordsLWC
-        }).then((result)=>{
-            result = JSON.parse(JSON.stringify(result));
-            if (result.status == 'Success') {
-            this.overduePageRecords = JSON.parse(result.entity.overduePageRecords);
-            this.iSinventory = result.entity.iSinventory;
-            console.log('result褰曞叆'+JSON.stringify( result));
-            console.log(JSON.stringify( this.overduePageRecords ));
-            for(let i in this.overduePageRecords){
-                this.overduePageRecords[i]['Name__c'] = this.overduePageRecords[i].Prod.Name__c;
-                this.overduePageRecords[i]['Bar_Code__c'] = this.overduePageRecords[i].orderdetails2.Bar_Code__c;
-                this.overduePageRecords[i]['Box_Piece__c'] = this.overduePageRecords[i].orderdetails2.Box_Piece__c;
-                this.overduePageRecords[i]['Sterilization_limit__c'] = this.overduePageRecords[i].orderdetails2.Sterilization_limit__c;
-            }
-           this.data = JSON.parse(result.entity.codPageRecords);
-           console.log(' this.data'+ JSON.stringify(this.data));
-           for (var i in this.data) {
-            if (this.data[i]['check']) {
-              this.selectedRows.push(this.data[i].prodid);
-              console.log('selectedRows:' + this.selectedRows);
-            }
-          }
-          this.showSpinner = false;
-          this.showTables = true;
-          this.showTable = true;
-        }else{
-          console.log('result.msg = ' + result.msg);
-          const evt = new ShowToastEvent({
-            title: '褰曞叆澶辫触',
-            message: result.msg,
-            variant: 'error'
-          });
-          this.dispatchEvent(evt);
-
-        }
-
-        }).catch((error) => {
-            console.log('error = ' + JSON.stringify(error));
-          });
-     
-    }
-     //鑾峰彇褰撳墠杈撳叆鍊�
-  handleChange(event) {
-    let value = event.detail.value;
-    console.log('value' + value);
-    this.barcode = value;
-    console.log('this.barcode'+this.barcode);
-  }
-  getSelectedRows(event) {
-    console.log('鎵撳嬀');
-    const selectedRows = event.detail.selectedRows;
-    console.log('this.selectedRows = ' + this.selectedRows);
-    for (var i in this.data) {
-      this.data[i]['check'] = false;
-    }
-    for (var i in this.data) {
-      for (var j in selectedRows) {
-        console.log('this.selectedRows111 = ' + selectedRows[j].prodid);
-        console.log('this.selectedRows1112 = ' + this.data[i].prodid );
-        if (this.data[i].prodid == selectedRows[j].prodid) {
-          this.data[i]['check'] = true;
-        }
-      }
-    }
-  }
-  //淇濆瓨
-  
-  saveConfirm() {
-    console.log('杩涘叆閿�瀛樼‘璁�');
-    var el = this.template.querySelector('c-lex-custom-lightning-datatable');
-    var selected = el.getSelectedRows();
-    this.selectedData = selected;
-    console.log('閫変腑鏁版嵁' + JSON.stringify(this.selectedData));
-    save({
-      iSinventory: this.iSinventory,
-      saveCodPageRecords:  JSON.stringify(this.selectedData)
-    }).then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log('result淇濆瓨 = ' + JSON.stringify(result));
-        if (result.status == 'Success') {
-            this[NavigationMixin.Navigate]({
-                type: 'standard__recordPage',
-                attributes: {
-                    recordId:result.entity.Id,
-                    objectApiName: 'Consumable_order__c',
-                    actionName: 'view'
+            userWorkLocationLWC: this.userWorkLocation,
+            barcodeLWC: this.barcode,
+            codPageRecordsLWC: this.codPageRecordsLWC
+        })
+            .then((result) => {
+                result = JSON.parse(JSON.stringify(result));
+                if (result.status == 'Success') {
+                    this.overduePageRecords = JSON.parse(
+                        result.entity.overduePageRecords
+                    );
+                    this.overdueList = result.entity.overdueList;
+                    this.iSinventory = result.entity.iSinventory;
+                    console.log('result褰曞叆' + JSON.stringify(result));
+                    for (let i in this.overduePageRecords) {
+                        if (this.overduePageRecords[i].Prod != null) {
+                            this.overduePageRecords[i]['Name__c'] =
+                                this.overduePageRecords[i].Prod.Name__c;
+                        }
+                        this.overduePageRecords[i]['Bar_Code__c'] =
+                            this.overduePageRecords[
+                                i
+                            ].orderdetails2.Bar_Code__c;
+                        this.overduePageRecords[i]['Box_Piece__c'] =
+                            this.overduePageRecords[
+                                i
+                            ].orderdetails2.Box_Piece__c;
+                        this.overduePageRecords[i]['Sterilization_limit__c'] =
+                            this.overduePageRecords[
+                                i
+                            ].orderdetails2.Sterilization_limit__c;
+                    }
+                    this.data = JSON.parse(result.entity.codPageRecords);
+                    console.log(' this.data' + JSON.stringify(this.data));
+                    for (var i in this.data) {
+                        if (this.data[i]['check']) {
+                            this.selectedRows.push(this.data[i].prodid);
+                            console.log('selectedRows:' + this.selectedRows);
+                        }
+                    }
+                    this.showSpinner = false;
+                    // this.showTables = true;
+                    this.showTable = true;
+                } else {
+                    console.log('result.msg = ' + result.msg);
+                    const evt = new ShowToastEvent({
+                        title: '褰曞叆澶辫触',
+                        message: result.msg,
+                        variant: 'error'
+                    });
+                    this.dispatchEvent(evt);
+                    this.showSpinner = false;
                 }
+            })
+            .catch((error) => {
+                console.log('error = ' + JSON.stringify(error));
             });
-        } else {
-          console.log('result.msg = ' + result.msg);
-          const evt = new ShowToastEvent({
-            title: '澶辫触',
-            message: result.msg,
-            variant: 'error'
-          });
-          this.dispatchEvent(evt);
+    }
+    //鑾峰彇褰撳墠杈撳叆鍊�
+    handleChange(event) {
+        let value = event.detail.value;
+        console.log('value' + value);
+        this.barcode = value;
+        console.log('this.barcode' + this.barcode);
+    }
+    getSelectedRows(event) {
+        console.log('鎵撳嬀');
+        const selectedRows = event.detail.selectedRows;
+        console.log('this.selectedRows = ' + this.selectedRows);
+        for (var i in this.data) {
+            this.data[i]['check'] = false;
         }
-      })
-      .catch((error) => {
-        console.log('error = ' + JSON.stringify(error));
-      });
-  }
+        for (var i in this.data) {
+            for (var j in selectedRows) {
+                console.log('this.selectedRows111 = ' + selectedRows[j].prodid);
+                console.log('this.selectedRows1112 = ' + this.data[i].prodid);
+                if (this.data[i].prodid == selectedRows[j].prodid) {
+                    this.data[i]['check'] = true;
+                }
+            }
+        }
+    }
+    //淇濆瓨
 
-
-
-
-
-
-
-}
\ No newline at end of file
+    saveConfirm() {
+        console.log('杩涘叆閿�瀛樼‘璁�');
+        var el = this.template.querySelector(
+            'c-lex-custom-lightning-datatable'
+        );
+        var selected = el.getSelectedRows();
+        this.selectedData = selected;
+        console.log('閫変腑鏁版嵁' + JSON.stringify(this.selectedData));
+        save({
+            iSinventory: this.iSinventory,
+            saveCodPageRecords: JSON.stringify(this.selectedData),
+            saveoverdueList: JSON.stringify(this.overdueList)
+        })
+            .then((result) => {
+                result = JSON.parse(JSON.stringify(result));
+                console.log('result淇濆瓨 = ' + JSON.stringify(result));
+                if (result.status == 'Success') {
+                    this[NavigationMixin.Navigate]({
+                        type: 'standard__recordPage',
+                        attributes: {
+                            recordId: result.entity.Id,
+                            objectApiName: 'Consumable_order__c',
+                            actionName: 'view'
+                        }
+                    });
+                } else {
+                    console.log('result.msg = ' + result.msg);
+                    const evt = new ShowToastEvent({
+                        title: '澶辫触',
+                        message: result.msg,
+                        variant: 'error'
+                    });
+                    this.dispatchEvent(evt);
+                }
+            })
+            .catch((error) => {
+                console.log('error = ' + JSON.stringify(error));
+            });
+    }
+}
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
index fc8aa29..e30dc63 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
@@ -2,53 +2,183 @@
 <!-- sldsValidatorIgnore -->
 <template>
     <template if:true={isShowSpinner}>
-        <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+        <lightning-spinner
+            alternative-text="Loading"
+            size="large"
+        ></lightning-spinner>
     </template>
     <!-- 鎼滅储瀹㈡埛鍚� -->
     <template if:true={isModalOpen}>
         <!-- Modal/Popup Box LWC starts here -->
-        <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
-            aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open">
+        <section
+            role="dialog"
+            tabindex="-1"
+            aria-labelledby="modal-heading-01"
+            aria-modal="true"
+            aria-describedby="modal-content-id-1"
+            class="slds-modal slds-fade-in-open"
+        >
             <div class="slds-modal__container">
                 <!-- Modal/Popup Box LWC header here -->
                 <header class="slds-modal__header">
-                    <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
-                        title="Close" onclick={closeModal}>
-                        <lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
-                            size="small"></lightning-icon>
+                    <button
+                        class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
+                        title="Close"
+                        onclick={closeModal}
+                    >
+                        <lightning-icon
+                            icon-name="utility:close"
+                            alternative-text="close"
+                            variant="inverse"
+                            size="small"
+                        ></lightning-icon>
                         <span class="slds-assistive-text">Close</span>
                     </button>
-                    <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
+                    <h2
+                        id="modal-heading-01"
+                        class="slds-text-heading_medium slds-hyphenate"
+                    >
                         缁忛攢鍟嗗尰闄㈡绱�
                     </h2>
                 </header>
                 <!-- Modal/Popup Box LWC body starts here -->
-                <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
+                <div
+                    class="slds-modal__content slds-p-around_medium"
+                    id="modal-content-id-1"
+                >
                     <lightning-layout>
-                        <lightning-layout-item flexibility="auto" padding="around-small">
-                            <lightning-input type="text" label="鍖婚櫌鍚嶇О" onchange={dataChange}
-                                data-field="searchHospitalName" value={searchHospitalName}
-                                variant="label-inline"></lightning-input>
+                        <lightning-layout-item
+                            flexibility="auto"
+                            padding="around-small"
+                        >
+                            <lightning-input
+                                type="text"
+                                label="鍖婚櫌鍚嶇О"
+                                onchange={dataChange}
+                                data-field="searchHospitalName"
+                                value={searchHospitalName}
+                                variant="label-inline"
+                            ></lightning-input>
                         </lightning-layout-item>
-                        <lightning-layout-item flexibility="auto" padding="around-small">
-                            <lightning-button label="妫�绱�" onclick={searchHospital}></lightning-button>
+                        <lightning-layout-item
+                            flexibility="auto"
+                            padding="around-small"
+                        >
+                            <lightning-button
+                                label="妫�绱�"
+                                onclick={searchHospital}
+                            ></lightning-button>
                         </lightning-layout-item>
                     </lightning-layout>
 
                     <div class="tableColumn">
                         <lightning-layout class="datatable">
-                            <lightning-datatable class="datatabel slds-border_top" key-field="id" data={hospitalList}
-                                columns={hospitalColumns} hide-checkbox-column="true"
-                                onrowaction={searchHandleRowAction}>
+                            <lightning-datatable
+                                class="datatabel slds-border_top"
+                                key-field="id"
+                                data={hospitalList}
+                                columns={hospitalColumns}
+                                hide-checkbox-column="true"
+                                onrowaction={searchHandleRowAction}
+                            >
                             </lightning-datatable>
                         </lightning-layout>
                     </div>
                 </div>
                 <!-- Modal/Popup Box LWC footer starts here -->
                 <footer class="slds-modal__footer">
-                    <button class="slds-button slds-button_neutral" onclick={closeModal} title="Cancel">
+                    <button
+                        class="slds-button slds-button_neutral"
+                        onclick={closeModal}
+                        title="Cancel"
+                    >
                         鍏抽棴
                     </button>
+                </footer>
+            </div>
+        </section>
+        <div class="slds-backdrop slds-backdrop_open"></div>
+    </template>
+
+    <!-- 涓婁紶闄勪欢寮圭獥 -->
+    <template if:true={showAttPop}>
+        <section
+            role="dialog"
+            tabindex="-1"
+            aria-labelledby="modal-heading-01"
+            aria-modal="true"
+            aria-describedby="modal-content-id-1"
+            class="slds-modal slds-fade-in-open slds-modal_small"
+            style="border: 1px solid #d4d4d4"
+        >
+            <template if:true={showPopSpinner}>
+                <lightning-spinner
+                    size="medium"
+                    variant="brand"
+                ></lightning-spinner>
+            </template>
+            <div class="slds-modal__container">
+                <header
+                    class="slds-modal__header"
+                    style="background-color: #f3f3f3"
+                >
+                    <button
+                        style=""
+                        class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
+                        title="Close"
+                        onclick={closePop}
+                    >
+                        <lightning-icon
+                            icon-name="utility:close"
+                            alternative-text="close"
+                            variant="inverse"
+                            size="small"
+                        ></lightning-icon>
+                        <span class="slds-assistive-text">Close</span>
+                    </button>
+                    <h2
+                        id="modal-heading-02"
+                        class="slds-text-heading_medium slds-hyphenate"
+                    >
+                        涓婁紶闄勪欢
+                    </h2>
+                </header>
+                <div
+                    class="slds-modal__content slds-p-around_medium"
+                    id="modal-content-id-2"
+                    style="border: 1px solid #f3f3f3"
+                >
+                    <div class="slds-m-top_medium slds-m-bottom_x-large">
+                        <div class="slds-p-around_medium lgc-bg">
+                            <lightning-input
+                                type="file"
+                                label="闄勪欢涓婁紶"
+                                accept=".xlsx, .xls, .csv, .png, .doc, .docx, .pdf"
+                                onchange={attChange}
+                            ></lightning-input>
+                        </div>
+                        <p>
+                            宸查�夋嫨鏂囦欢锛歿fileName}
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <template if:true={attDelBtn}>
+                                <a onclick={removeAtt}>绉婚櫎</a>
+                            </template>
+                        </p>
+                    </div>
+                </div>
+                <footer class="slds-modal__footer">
+                    <lightning-button
+                        style="margin-left: 10px"
+                        variant="neutral"
+                        label="鍙栨秷"
+                        onclick={closePop}
+                    ></lightning-button>
+                    <lightning-button
+                        style="margin-left: 10px"
+                        variant="neutral"
+                        label="涓婁紶"
+                        onclick={handleSave}
+                    ></lightning-button>
                 </footer>
             </div>
         </section>
@@ -63,8 +193,6 @@
                     <div style="padding: 10px">
                         <div lwc:dom="manual" class="resultDiv"></div>
                         <div draggable="false">
-                            <!-- <lightning-button label="淇濆瓨" onclick={neworderhead}
-                                style="margin-left: 100px;"></lightning-button> -->
                             <table>
                                 <colgroup>
                                     <col width="150px" />
@@ -83,66 +211,89 @@
                                     <col width="100px" />
                                 </colgroup>
                                 <tr>
-                                    <td></td>
-                                    <!-- <td  colspan="4"><apex:commandButton onclick="saveConfirmJs('{!coc.SummonsStatus_c__c}');" value="淇濆瓨" style="width:150px" rerender="dummy" rendered="{!(EditDelCommitBtnDisabled||EditAble)}"/></td> -->
-                                    <td colspan="4">
+                                    <td>
                                         <template if:true={isSaveShow}>
+                                            <lightning-button
+                                                label="淇濆瓨"
+                                                onclick={saveConfirmJs}
+                                                style="width: 150px"
+                                            ></lightning-button>
+                                        </template>
+                                    </td>
+                                    <td colspan="4">
+                                        <!-- <template if:true={isSaveShow}>
                                             <lightning-button label="淇濆瓨" onclick={saveConfirmJs}
                                                 style="width: 150px"></lightning-button>
-                                        </template>
+                                        </template> -->
                                     </td>
                                 </tr>
                                 <tr>
                                     <td></td>
                                     <td>
-                                        <!-- <apex:commandButton onclick="EditConsumable();"   value="缂栬緫鍑哄簱鍗�" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.SummonsStatus_c__c='宸插畬鎴�',true,false)}"/> -->
                                         <template if:true={isEditShow}>
-                                            <lightning-button label="缂栬緫鍑哄簱鍗�" onclick={EditConsumable}
-                                                style="width: 150px" disabled={isEditDisabled}></lightning-button>
+                                            <lightning-button
+                                                label="缂栬緫鍑哄簱鍗�"
+                                                onclick={EditConsumable}
+                                                style="width: 150px"
+                                                disabled={isEditDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
-                                    <!--CHAN-B65CAZ 20181105 UpdateStart-->
-                                    <!-- <td ><apex:commandButton onclick="CommitConsumable();" value="鎻愪氦鍑哄簱鍗�" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.SummonsStatus_c__c='鎵瑰噯'||coc.SummonsStatus_c__c='宸查攢鍞緟涓婁紶绾冲搧涔�'||coc.SummonsStatus_c__c='鍑哄簱鍗曞凡鎵撳嵃'||coc.SummonsStatus_c__c='宸插畬鎴�',true,false)}"/></td> -->
+
                                     <td>
-                                        <!-- <apex:commandButton onclick="GoodsDeliveryJs();"  value="鍑鸿揣/閿�鍞�"     style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.SummonsStatus_c__c='宸查攢鍞緟涓婁紶绾冲搧涔�'||coc.SummonsStatus_c__c='宸插畬鎴�'||coc.SummonsStatus_c__c='浠锋牸鏈畾',true,false)}"/> -->
                                         <template if:true={isDeliveryShow}>
-                                            <lightning-button label="鍑鸿揣/閿�鍞�" onclick={GoodsDeliveryJs}
-                                                style="width: 150px" disabled={isDeliveryDisabled}></lightning-button>
+                                            <lightning-button
+                                                label="鍑鸿揣/閿�鍞�"
+                                                onclick={GoodsDeliveryJs}
+                                                style="width: 150px"
+                                                disabled={isDeliveryDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
-                                    <!-- CHAN-B65CAZ 20181105 UpdateEnd-->
+
                                     <td>
-                                        <!-- <apex:commandButton onclick="openToInvoiceJs();return false;" value="寮�绁�" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(((coc.Billed_Status__c !='鍏ㄩ儴寮�绁�' &&coc.SummonsStatus_c__c='宸插畬鎴�') || coc.Onchange_order__c = true) && coc.SummonsForDirction__c!='浜掔浉璋冭揣',false,true)}"/> -->
                                         <template if:true={isOpenToInvoiceShow}>
-                                            <lightning-button label="寮�绁�" onclick={openToInvoiceJs} style="width: 150px"
-                                                disabled={isOpenToInvoiceDisabled}></lightning-button>
+                                            <lightning-button
+                                                label="寮�绁�"
+                                                onclick={openToInvoiceJs}
+                                                style="width: 150px"
+                                                disabled={isOpenToInvoiceDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td></td>
-                                    <!--CHAN-B65CAZ 20181105 UpdateStart-->
+
                                     <td>
-                                        <!-- <apex:commandButton onclick="PraseToPDFJs();" value="鎵撳嵃鎸囩ず鍗�" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.SummonsStatus_c__c='宸查攢鍞緟涓婁紶绾冲搧涔�'||coc.SummonsStatus_c__c='鎵瑰噯'||coc.SummonsStatus_c__c='鍑哄簱鍗曞凡鎵撳嵃'||coc.SummonsStatus_c__c='鑽夋涓�',false,true)}"/> -->
                                         <template if:true={isPraseToPDFShow}>
-                                            <lightning-button label="鎵撳嵃鎸囩ず鍗�" onclick={PraseToPDFJs} style="width: 150px"
-                                                disabled={isPraseToPDFDisabled}></lightning-button>
+                                            <lightning-button
+                                                label="鎵撳嵃鎸囩ず鍗�"
+                                                onclick={PraseToPDFJs}
+                                                style="width: 150px"
+                                                disabled={isPraseToPDFDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
-                                    <!-- CHAN-B65CAZ 20181105 UpdateEnd-->
+
                                     <td>
-                                        <!-- <apex:commandButton onclick="openReportJs(); return false;" value="鏄剧ず鏄庣粏" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.Billed_Status__c !='杩樻病寮�绁�' || coc.SummonsStatus_c__c='宸插畬鎴�',false,true)}"/> -->
                                         <template if:true={isOpenReportShow}>
-                                            <lightning-button label="鏄剧ず鏄庣粏" onclick={openReportJs} style="width: 150px"
-                                                disabled={isOpenReportDisabled}></lightning-button>
+                                            <lightning-button
+                                                label="鏄剧ず鏄庣粏"
+                                                onclick={openReportJs}
+                                                style="width: 150px"
+                                                disabled={isOpenReportDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
                                     <td>
-                                        <!-- <apex:commandButton onclick="DeleteConsumable();" value="鍒犻櫎" style="width:150px" rerender="dummy" rendered="{!!(EditDelCommitBtnDisabled||EditAble)}" disabled="{!IF(coc.SummonsStatus_c__c='宸查攢鍞緟涓婁紶绾冲搧涔�'||coc.SummonsStatus_c__c='浠锋牸鏈畾'||coc.SummonsStatus_c__c='鎵瑰噯'||coc.SummonsStatus_c__c='鍑哄簱鍗曞凡鎵撳嵃'||coc.SummonsStatus_c__c='宸插畬鎴�',true,false)}"/> -->
                                         <template if:true={isDeleteShow}>
-                                            <lightning-button label="鍒犻櫎" onclick={DeleteConsumable} style="width: 150px"
-                                                disabled={isDeleteDisabled}></lightning-button>
-                                            <!-- <lightning-button label="鍒犻櫎" onclick={DeleteConsumable} style="width: 150px"></lightning-button> -->
+                                            <lightning-button
+                                                label="鍒犻櫎"
+                                                onclick={DeleteConsumable}
+                                                style="width: 150px"
+                                                disabled={isDeleteDisabled}
+                                            ></lightning-button>
                                         </template>
                                     </td>
                                     <td></td>
@@ -164,210 +315,384 @@
                             <div lwc:dom="manual" class="resultDiv"></div>
                             <div draggable="false">
                                 <!-- SummonsStatus_c__c == '浠锋牸鏈畾' -->
-                                <template if:true={summonsStatusPriceNotDetermined}>
-                                    <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}>
+                                <template
+                                    if:true={summonsStatusPriceNotDetermined}
+                                >
+                                    <lightning-record-edit-form
+                                        object-api-name="Consumable_order__c"
+                                        record-id={cocId}
+                                        onload={handleLoad}
+                                    >
                                         <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
                                         <lightning-layout multiple-rows="true">
                                             <template if:true={isSummonsFlag}>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                    <lightning-output-field field-name="Name"></lightning-output-field>
-                                                </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                <lightning-layout-item
+                                                    size="1"
+                                                ></lightning-layout-item>
+
+                                                <lightning-layout-item size="4">
                                                     <lightning-output-field
-                                                        field-name="SummonsStatus_c__c"></lightning-output-field>
+                                                        field-name="Name"
+                                                        class="hehe-layoutItem"
+                                                    ></lightning-output-field>
                                                 </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                                <lightning-layout-item
+                                                    size="1"
+                                                ></lightning-layout-item>
+
+                                                <lightning-layout-item
+                                                    class="hehe-layoutItem"
+                                                    size="4"
+                                                >
+                                                    <lightning-output-field
+                                                        field-name="SummonsStatus_c__c"
+                                                    ></lightning-output-field>
                                                 </lightning-layout-item>
                                             </template>
                                         </lightning-layout>
 
                                         <!-- 鐩殑   寮�绁ㄧ姸鎬� -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="SummonsForDirction__c"></lightning-output-field>
+                                                    field-name="SummonsForDirction__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="Billed_Status__c"></lightning-output-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    field-name="Billed_Status__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 浜岀骇缁忛攢鍟� -->
-                                        <template if:true={isSummonsForDirctionTwoShow}>
-                                            <lightning-layout multiple-rows="true">
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                        <template
+                                            if:true={isSummonsForDirctionTwoShow}
+                                        >
+                                            <lightning-layout
+                                                multiple-rows="true"
+                                            >
+                                                <lightning-layout-item
+                                                    size="1"
+                                                ></lightning-layout-item>
+
+                                                <lightning-layout-item
+                                                    class="hehe-layoutItem"
+                                                    size="4"
+                                                >
                                                     <lightning-output-field
-                                                        field-name="Order_Dealer_Info__c"></lightning-output-field>
-                                                </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                        field-name="Order_Dealer_Info__c"
+                                                    ></lightning-output-field>
                                                 </lightning-layout-item>
                                             </lightning-layout>
                                         </template>
 
                                         <!-- 瀹㈡埛鍚� 鍙戠エ-->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="ShipmentAccount__c"></lightning-output-field>
+                                                    class="hideHelpText"
+                                                    field-name="ShipmentAccount__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input-field data-field={ConInvoice_Code__c}
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-input-field
+                                                    data-field={ConInvoice_Code__c}
                                                     onchange={invoiceChange}
-                                                    field-name="ConInvoice_Code__c"></lightning-input-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    field-name="ConInvoice_Code__c"
+                                                ></lightning-input-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 绉戝 鍑哄簱閲戦 -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="Order_ForCustomerText__c"></lightning-output-field>
+                                                    field-name="Order_ForCustomerText__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="Shipment_total_amount__c"></lightning-output-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    field-name="Shipment_total_amount__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 娌℃湁纭畾浠锋牸 -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <lightning-output-field
-                                                    field-name="NoConfirmedPrice__c"></lightning-output-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    field-name="NoConfirmedPrice__c"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
                                     </lightning-record-edit-form>
                                 </template>
 
                                 <!-- SummonsStatus_c__c != '浠锋牸鏈畾' -->
-                                <template if:false={summonsStatusPriceNotDetermined}>
-                                    <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}
-                                        onsubmit={handleSubmit}>
+                                <template
+                                    if:false={summonsStatusPriceNotDetermined}
+                                >
+                                    <lightning-record-edit-form
+                                        object-api-name="Consumable_order__c"
+                                        record-id={cocId}
+                                        onsubmit={handleSubmit}
+                                        onload={handleLoad}
+                                    >
                                         <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
                                         <lightning-layout multiple-rows="true">
                                             <template if:true={isSummonsFlag}>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                    <lightning-output-field field-name="Name"></lightning-output-field>
-                                                </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                <lightning-layout-item
+                                                    size="1"
+                                                ></lightning-layout-item>
+
+                                                <lightning-layout-item
+                                                    class="hehe-layoutItem"
+                                                    size="4"
+                                                >
                                                     <lightning-output-field
-                                                        field-name="SummonsStatus_c__c"></lightning-output-field>
+                                                        field-name="Name"
+                                                    ></lightning-output-field>
                                                 </lightning-layout-item>
-                                                <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                                <lightning-layout-item
+                                                    size="1"
+                                                ></lightning-layout-item>
+
+                                                <lightning-layout-item
+                                                    class="hehe-layoutItem"
+                                                    size="4"
+                                                >
+                                                    <lightning-output-field
+                                                        field-name="SummonsStatus_c__c"
+                                                    ></lightning-output-field>
                                                 </lightning-layout-item>
                                             </template>
                                         </lightning-layout>
 
                                         <!-- 鐩殑   浜岀骇缁忛攢鍟� -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input-field data-field="summonsForDirction"
-                                                    value={summonsForDirction} field-name="SummonsForDirction__c"
-                                                    required="true" onchange={ChangeDirction}></lightning-input-field>
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-input-field
+                                                    data-field="summonsForDirction"
+                                                    value={summonsForDirction}
+                                                    field-name="SummonsForDirction__c"
+                                                    required="true"
+                                                    onchange={ChangeDirction}
+                                                ></lightning-input-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-combobox data-field="secondaryDistributor"
-                                                    name="secondaryDistributor" label="浜岀骇缁忛攢鍟�"
-                                                    value={secondaryDistributor} placeholder="璇烽�夋嫨..."
-                                                    options={secondaryDistributorOptions} variant="label-inline"
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-combobox
+                                                    data-field="secondaryDistributor"
+                                                    name="secondaryDistributor"
+                                                    label="浜岀骇缁忛攢鍟�"
+                                                    value={secondaryDistributor}
+                                                    placeholder="璇烽�夋嫨..."
+                                                    options={secondaryDistributorOptions}
+                                                    variant="label-inline"
                                                     onchange={dataChange}
-                                                    disabled={isDisabledSecondaryDistributor}></lightning-combobox>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    disabled={isDisabledSecondaryDistributor}
+                                                ></lightning-combobox>
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 瀹㈡埛鍚�   缁忛攢鍟嗗綍鍏� -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
                                                 <div
-                                                    class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
-                                                    <lightning-icon size="x-small"
+                                                    class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right"
+                                                >
+                                                    <lightning-icon
+                                                        size="x-small"
                                                         class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default"
-                                                        icon-name="utility:search"></lightning-icon>
-                                                    <lightning-input type="text" name="HospitalName" label="瀹㈡埛鍚�"
-                                                        value={HospitalName} variant="label-inline"
-                                                        onclick={searchHospitalNameModal} data-field="HospitalName"
+                                                        icon-name="utility:search"
+                                                    ></lightning-icon>
+                                                    <lightning-input
+                                                        type="text"
+                                                        name="HospitalName"
+                                                        label="瀹㈡埛鍚�"
+                                                        value={HospitalName}
+                                                        variant="label-inline"
+                                                        onclick={searchHospitalNameModal}
+                                                        data-field="HospitalName"
                                                         disabled={isDisabledHospitalName}
-                                                        onchange={clearAgencyI}></lightning-input>
+                                                        onchange={clearAgencyI}
+                                                    ></lightning-input>
                                                 </div>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <!-- <lightning-input-field onfocus={setVisitorPlace} onblur={vpClear2Delay} data-field="ForDealerText"
-                                                    value={ForDealerText} field-name="Order_ForDealerText__c"
-                                                    disabled={isDisabledForDealerText}></lightning-input-field> -->
-                                                <!-- <lightning-input type="text" 
-                                                        name="Order_ForDealerText__c" 
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <template
+                                                    if:true={isMutualTransferGoods}
+                                                >
+                                                    <c-lex-lookup
+                                                        onsearch={handleSearch}
+                                                        onselectionchange={handleSelectionChange}
                                                         label="缁忛攢鍟�(褰曞叆)"
-                                                        value={ForDealerText}
-                                                        onfocus={setVisitorPlace} 
+                                                        variant="label-inline"
+                                                        placeholder="鎼滅储缁忛攢鍟�"
+                                                        onisdisabledfordealertext={isDisabledForDealerText}
                                                         onblur={vpClear2Delay}
-                                                        data-field="Order_ForDealerText__c"
                                                         disabled={isDisabledForDealerText}
-                                                        variant="label-inline">
-                                                    </lightning-input> -->
-                                                <!-- <c-lookup onsearch={handleSearch} onselectionchange={handleSelectionChange}
-                                                    label="缁忛攢鍟�(褰曞叆)" variant="label-inline"  placeholder="鎼滅储缁忛攢鍟�">
-                                                </c-lookup> -->
-                                                <template if:true={isMutualTransferGoods}>
-                                                    <c-lex-lookup onsearch={handleSearch}
-                                                        onselectionchange={handleSelectionChange} label="缁忛攢鍟�(褰曞叆)"
-                                                        variant="label-inline" placeholder="鎼滅储缁忛攢鍟�"
-                                                        onblur={vpClear2Delay} disabled={isDisabledForDealerText}>
+                                                    >
                                                     </c-lex-lookup>
                                                 </template>
-                                                <template if:false={isMutualTransferGoods}>
-                                                    <lightning-input type="text" name="Order_ForDealerText__c"
-                                                        label="缁忛攢鍟�(褰曞叆)" value={ForDealerText} onchange={dataChange}
+                                                <template
+                                                    if:false={isMutualTransferGoods}
+                                                >
+                                                    <lightning-input
+                                                        type="text"
+                                                        name="Order_ForDealerText__c"
+                                                        label="缁忛攢鍟�(褰曞叆)"
+                                                        value={ForDealerText}
+                                                        onchange={dataChange}
                                                         data-field="Order_ForDealerText__c"
-                                                        disabled={isDisabledForDealerText} variant="label-inline">
+                                                        disabled={isDisabledForDealerText}
+                                                        variant="label-inline"
+                                                    >
                                                     </lightning-input>
                                                 </template>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 绉戝   鎬婚噾棰� -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input-field onchange={dataChange}
-                                                    data-field="ForCustomerText" value={ForCustomerText}
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-input-field
+                                                    onchange={dataChange}
+                                                    data-field="ForCustomerText"
+                                                    value={ForCustomerText}
                                                     field-name="Order_ForCustomerText__c"
-                                                    disabled={isDisabledForCustomerText}></lightning-input-field>
+                                                    disabled={isDisabledForCustomerText}
+                                                ></lightning-input-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input type="text" name="sumPrice" label="鎬婚噾棰�"
-                                                    value={sumPrice} variant="label-inline" onchange={dataChange}
-                                                    data-field="sumPrice" readonly></lightning-input>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-input
+                                                    type="text"
+                                                    name="sumPrice"
+                                                    label="鎬婚噾棰�"
+                                                    value={sumPrice}
+                                                    variant="label-inline"
+                                                    onchange={dataChange}
+                                                    data-field="sumPrice"
+                                                    readonly
+                                                ></lightning-input>
                                             </lightning-layout-item>
                                         </lightning-layout>
 
                                         <!-- 娌℃湁纭畾浠锋牸 -->
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input-field value={NoConfirmedPrice}
-                                                    field-name="NoConfirmedPrice__c" data-field="NoConfirmedPrice"
-                                                    onchange={dataChange}></lightning-input-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item
+                                                class="hehe-layoutItem"
+                                                size="4"
+                                            >
+                                                <lightning-input-field
+                                                    value={NoConfirmedPrice}
+                                                    field-name="NoConfirmedPrice__c"
+                                                    data-field="NoConfirmedPrice"
+                                                    onchange={dataChange}
+                                                ></lightning-input-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
                                     </lightning-record-edit-form>
@@ -388,90 +713,146 @@
                         <div style="padding: 10px">
                             <div lwc:dom="manual" class="resultDiv"></div>
                             <div draggable="false">
-                                <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}>
+                                <lightning-record-edit-form
+                                    object-api-name="Consumable_order__c"
+                                    record-id={cocId}
+                                    onload={handleLoad2}
+                                >
                                     <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
                                     <lightning-layout multiple-rows="true">
                                         <template if:true={isSummonsFlag}>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-output-field field-name="Name"></lightning-output-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item size="4">
                                                 <lightning-output-field
-                                                    field-name="SummonsStatus_c__c"></lightning-output-field>
+                                                    field-name="Name"
+                                                    class="hehe-layoutItem"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item size="4">
+                                                <lightning-output-field
+                                                    field-name="SummonsStatus_c__c"
+                                                    class="hehe-layoutItem"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
                                         </template>
                                     </lightning-layout>
 
                                     <!-- 鐩殑   寮�绁ㄧ姸鎬� -->
                                     <lightning-layout multiple-rows="true">
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="SummonsForDirction__c"></lightning-output-field>
+                                                field-name="SummonsForDirction__c"
+                                                class="hehe-layoutItem"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="Billed_Status__c"></lightning-output-field>
-                                        </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                field-name="Billed_Status__c"
+                                                class="hehe-layoutItem"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
                                     </lightning-layout>
 
                                     <!-- 浜岀骇缁忛攢鍟� -->
-                                    <template if:true={isSummonsForDirctionTwoShow}>
+                                    <template
+                                        if:true={isSummonsForDirctionTwoShow}
+                                    >
                                         <lightning-layout multiple-rows="true">
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                            <lightning-layout-item
+                                                size="1"
+                                            ></lightning-layout-item>
+
+                                            <lightning-layout-item size="4">
                                                 <lightning-output-field
-                                                    field-name="Order_Dealer_Info__c"></lightning-output-field>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                            </lightning-layout-item>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                    field-name="Order_Dealer_Info__c"
+                                                    class="hehe-layoutItem"
+                                                ></lightning-output-field>
                                             </lightning-layout-item>
                                         </lightning-layout>
                                     </template>
 
                                     <!-- 瀹㈡埛鍚� 鍙戠エ-->
                                     <lightning-layout multiple-rows="true">
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="ShipmentAccount__c"></lightning-output-field>
+                                                class="hideHelpText"
+                                                field-name="ShipmentAccount__c"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
+
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
                                         <template if:true={isConInvoiceShow}>
-                                            <lightning-layout-item class="hehe-layoutItem" size="4">
-                                                <lightning-input-field data-field={ConInvoice_Code__c}
+                                            <lightning-layout-item size="4">
+                                                <lightning-input-field
+                                                    data-field={ConInvoice_Code__c}
                                                     onchange={invoiceChange}
-                                                    field-name="ConInvoice_Code__c"></lightning-input-field>
+                                                    field-name="ConInvoice_Code__c"
+                                                    class="hehe-layoutItem"
+                                                ></lightning-input-field>
                                             </lightning-layout-item>
                                         </template>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
-                                        </lightning-layout-item>
                                     </lightning-layout>
 
                                     <!-- 绉戝 鍑哄簱閲戦 -->
                                     <lightning-layout multiple-rows="true">
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="Order_ForCustomerText__c"></lightning-output-field>
+                                                field-name="Order_ForCustomerText__c"
+                                                class="hehe-layoutItem"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="Shipment_total_amount__c"></lightning-output-field>
-                                        </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                field-name="Shipment_total_amount__c"
+                                                class="hehe-layoutItem"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
                                     </lightning-layout>
 
                                     <!-- 娌℃湁纭畾浠锋牸 -->
                                     <lightning-layout multiple-rows="true">
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                        <lightning-layout-item
+                                            size="1"
+                                        ></lightning-layout-item>
+
+                                        <lightning-layout-item size="4">
                                             <lightning-output-field
-                                                field-name="NoConfirmedPrice__c"></lightning-output-field>
-                                        </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
-                                        </lightning-layout-item>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
+                                                field-name="NoConfirmedPrice__c"
+                                                class="hehe-layoutItem"
+                                            ></lightning-output-field>
                                         </lightning-layout-item>
                                     </lightning-layout>
                                 </lightning-record-edit-form>
@@ -487,60 +868,146 @@
                             <div lwc:dom="manual" class="resultDiv"></div>
                             <div draggable="false">
                                 <lightning-layout multiple-rows>
-                                    <lightning-layout-item padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <div class="slds-form-element__label">娑堣�楀搧鍚嶇О</div>
-                                            <lightning-input type="text" name="consumableName" label="娑堣�楀搧鍚嶇О"
-                                                value={consumableName} variant="label-hidden" onchange={dataChange}
-                                                data-field="consumableName"></lightning-input>
-                                        </div>
-
-                                    </lightning-layout-item>
-                                    <lightning-layout-item size="2" padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <div class="slds-form-element__label">绗�3鍒嗙被</div>
-                                            <lightning-combobox name="progress" label="绗�3鍒嗙被" value={Category3}
-                                                variant="label-hidden" options={category3Options} onchange={dataChange}
-                                                data-field="Category3" style="min-width: 100px;"></lightning-combobox>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <div
+                                                class="slds-form-element__label"
+                                            >
+                                                娑堣�楀搧鍚嶇О
+                                            </div>
+                                            <lightning-input
+                                                type="text"
+                                                name="consumableName"
+                                                label="娑堣�楀搧鍚嶇О"
+                                                value={consumableName}
+                                                variant="label-hidden"
+                                                onchange={dataChange}
+                                                data-field="consumableName"
+                                            ></lightning-input>
                                         </div>
                                     </lightning-layout-item>
-                                    <lightning-layout-item size="2" padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <div class="slds-form-element__label">绗�4鍒嗙被</div>
-                                            <lightning-combobox name="progress" label="绗�4鍒嗙被" value={Category4}
-                                                variant="label-hidden" options={category4Options} onchange={dataChange}
-                                                data-field="Category4" style="min-width: 100px;"></lightning-combobox>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <div
+                                                class="slds-form-element__label"
+                                                style="width: 70px"
+                                            >
+                                                绗�3鍒嗙被
+                                            </div>
+                                            <lightning-combobox
+                                                name="progress"
+                                                label="绗�3鍒嗙被"
+                                                value={Category3}
+                                                variant="label-hidden"
+                                                options={category3Options}
+                                                onchange={dataChange}
+                                                data-field="Category3"
+                                                style="min-width: 185px"
+                                            ></lightning-combobox>
                                         </div>
-
                                     </lightning-layout-item>
-                                    <lightning-layout-item size="2" padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <div class="slds-form-element__label">绗�5鍒嗙被</div>
-                                            <lightning-combobox name="progress" label="绗�5鍒嗙被" value={Category5}
-                                                variant="label-hidden" onchange={dataChange} data-field="Category5"
-                                                options={category5Options} style="min-width: 100px;"></lightning-combobox>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <div
+                                                class="slds-form-element__label"
+                                                style="width: 70px"
+                                            >
+                                                绗�4鍒嗙被
+                                            </div>
+                                            <lightning-combobox
+                                                name="progress"
+                                                label="绗�4鍒嗙被"
+                                                value={Category4}
+                                                variant="label-hidden"
+                                                options={category4Options}
+                                                onchange={dataChange}
+                                                data-field="Category4"
+                                                style="min-width: 185px"
+                                            ></lightning-combobox>
                                         </div>
-
+                                    </lightning-layout-item>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <div
+                                                class="slds-form-element__label"
+                                                style="width: 70px"
+                                            >
+                                                绗�5鍒嗙被
+                                            </div>
+                                            <lightning-combobox
+                                                name="progress"
+                                                label="绗�5鍒嗙被"
+                                                value={Category5}
+                                                variant="label-hidden"
+                                                onchange={dataChange}
+                                                data-field="Category5"
+                                                options={category5Options}
+                                                style="min-width: 185px"
+                                            ></lightning-combobox>
+                                        </div>
                                     </lightning-layout-item>
                                     <template if:true={hasHosPro}>
-                                        <lightning-layout-item padding="around-small">
-                                            <div class="slds-grid slds-grid_vertical-align-center">
-                                                <div class="slds-form-element__label">鍖婚櫌鐗逛环</div>
-                                                <lightning-combobox name="progress" label="鍖婚櫌鐗逛环" value={outOutPattern}
-                                                    variant="label-hidden" options={outOutPatternOptionList}
-                                                    onchange={handleChange}></lightning-combobox>
+                                        <lightning-layout-item
+                                            padding="around-small"
+                                        >
+                                            <div
+                                                class="slds-grid slds-grid_vertical-align-center"
+                                            >
+                                                <div
+                                                    class="slds-form-element__label"
+                                                >
+                                                    鍖婚櫌鐗逛环
+                                                </div>
+                                                <lightning-combobox
+                                                    name="progress"
+                                                    label="鍖婚櫌鐗逛环"
+                                                    value={outOutPattern}
+                                                    variant="label-hidden"
+                                                    options={outOutPatternOptionList}
+                                                    onchange={handleChange}
+                                                ></lightning-combobox>
                                             </div>
                                         </lightning-layout-item>
                                     </template>
 
-                                    <lightning-layout-item padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <lightning-button label="妫�绱�" onclick={searchProductJs}></lightning-button>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <lightning-button
+                                                label="妫�绱�"
+                                                onclick={searchProductJs}
+                                            ></lightning-button>
                                         </div>
                                     </lightning-layout-item>
-                                    <lightning-layout-item padding="around-small">
-                                        <div class="slds-grid slds-grid_vertical-align-center">
-                                            <lightning-button label="娓呯┖" onclick={neworderhead}></lightning-button>
+                                    <lightning-layout-item
+                                        padding="around-small"
+                                    >
+                                        <div
+                                            class="slds-grid slds-grid_vertical-align-center"
+                                        >
+                                            <lightning-button
+                                                label="娓呯┖"
+                                                onclick={ClearJs}
+                                            ></lightning-button>
                                         </div>
                                     </lightning-layout-item>
                                 </lightning-layout>
@@ -559,21 +1026,41 @@
                     <div style="padding: 10px">
                         <template if:true={EditAble}>
                             <template if:true={showTable}>
-                                <c-lex-custom-lightning-datatable key-field="Id" data={data} columns={columns}
-                                    onunitchange={handleUnitChange} onshipmentnumber={handleShipmentNumber}
-                                    onshipmentunitprice={handleShipmentUnitPrice} onrowselection={getSelectedRows}
-                                    selected-rows={selectedRows} style="word-wrap:break-word; word-break:break-all; ">
+                                <c-lex-custom-lightning-datatable
+                                    key-field="Id"
+                                    data={data}
+                                    columns={columns}
+                                    onunitchange={handleUnitChange}
+                                    onshipmentnumber={handleShipmentNumber}
+                                    onshipmentunitprice={handleShipmentUnitPrice}
+                                    onrowselection={getSelectedRows}
+                                    selected-rows={selectedRows}
+                                    style="
+                                        word-wrap: break-word;
+                                        word-break: break-all;
+                                    "
+                                >
                                 </c-lex-custom-lightning-datatable>
                             </template>
                         </template>
 
                         <template if:false={EditAble}>
                             <template if:true={showTable}>
-                                <c-lex-custom-lightning-datatable hide-checkbox-column key-field="Id" data={data}
-                                    columns={editColumns} onunitchange={handleUnitChange}
+                                <c-lex-custom-lightning-datatable
+                                    hide-checkbox-column
+                                    key-field="Id"
+                                    data={data}
+                                    columns={editColumns}
+                                    onunitchange={handleUnitChange}
                                     onshipmentnumber={handleShipmentNumber}
-                                    onshipmentunitprice={handleShipmentUnitPrice} onrowselection={getSelectedRows}
-                                    selected-rows={selectedRows} style="word-wrap:break-word; word-break:break-all; ">
+                                    onshipmentunitprice={handleShipmentUnitPrice}
+                                    onrowselection={getSelectedRows}
+                                    selected-rows={selectedRows}
+                                    style="
+                                        word-wrap: break-word;
+                                        word-break: break-all;
+                                    "
+                                >
                                 </c-lex-custom-lightning-datatable>
                             </template>
                         </template>
@@ -589,8 +1076,12 @@
                             </p>
                         </div>
                         <div style="padding: 10px">
-                            <lightning-datatable key-field="id" data={consumableorderdetails2Records}
-                                columns={consumableorderdetails2RecordsColumns} hide-checkbox-column>
+                            <lightning-datatable
+                                key-field="id"
+                                data={consumableorderdetails2Records}
+                                columns={consumableorderdetails2RecordsColumns}
+                                hide-checkbox-column
+                            >
                             </lightning-datatable>
                         </div>
                     </div>
@@ -607,20 +1098,12 @@
                         <div style="padding: 10px">
                             <div lwc:dom="manual" class="resultDiv"></div>
                             <div draggable="false">
-                                <!-- <lightning-file-upload
-                                    label="涓婁紶闄勪欢"
-                                    name="fileUploader"
-                                    onuploadfinished={handleUploadFinishedEvent}
-                                    record-id={ESetid}
-                                    multiple>
-                                </lightning-file-upload> -->
-                                <!-- <c-poc-custom-comp 
-                                record-id={ESetid}
-                                acceptedformats={acceptedFormats}>
-                                </c-poc-custom-comp> -->
                                 <lightning-card title="">
-                                    <lightning-layout multiple-rows="true" style="margin-top: -20px">
-                                        <lightning-layout-item size="12">
+                                    <lightning-layout
+                                        multiple-rows="true"
+                                        style="margin-top: -20px"
+                                    >
+                                        <!-- <lightning-layout-item size="12">
                                             <lightning-input label="" name="file uploader" onchange={handleFilesChange}
                                                 type="file" accept={acceptedType}></lightning-input><br />
                                             <div class="slds-text-body_small">
@@ -630,14 +1113,30 @@
                                         <lightning-layout-item>
                                             <lightning-button label={UploadFile}
                                                 onclick={handleSave}></lightning-button>
+                                        </lightning-layout-item> -->
+                                        <lightning-layout-item size="5">
+                                        </lightning-layout-item>
+                                        <lightning-layout-item
+                                            padding="around-small"
+                                        >
+                                            <lightning-button
+                                                label="涓婁紶闄勪欢"
+                                                onclick={uploadOrder}
+                                            ></lightning-button>
                                         </lightning-layout-item>
                                     </lightning-layout>
                                     <template if:true={showLoadingSpinner}>
-                                        <lightning-spinner alternative-text="Uploading now"></lightning-spinner>
+                                        <lightning-spinner
+                                            alternative-text="Uploading now"
+                                        ></lightning-spinner>
                                     </template>
                                     <footer style="margin-top: 20px">
-                                        <lightning-datatable key-field="id" data={fileData} columns={fileColumns}
-                                            hide-checkbox-column>
+                                        <lightning-datatable
+                                            key-field="id"
+                                            data={fileData}
+                                            columns={fileColumns}
+                                            hide-checkbox-column
+                                        >
                                         </lightning-datatable>
                                     </footer>
                                 </lightning-card>
@@ -659,50 +1158,152 @@
                         <div lwc:dom="manual" class="resultDiv"></div>
                         <div draggable="false">
                             <lightning-layout multiple-rows="true">
-                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                <lightning-layout-item
+                                    class="hehe-layoutItem"
+                                    size="4"
+                                >
                                 </lightning-layout-item>
                                 <template if:true={isSales}>
-                                    <lightning-layout-item class="hehe-layoutItem" size="4">
-                                        <lightning-button label="閿�鍞�" onclick={SaveP}></lightning-button>
+                                    <lightning-layout-item
+                                        class="hehe-layoutItem"
+                                        size="4"
+                                    >
+                                        <lightning-button
+                                            label="閿�鍞�"
+                                            onclick={SaveP}
+                                            style="margin-top: -10px"
+                                        ></lightning-button>
                                     </lightning-layout-item>
                                 </template>
                                 <template if:false={isSales}>
-                                    <lightning-layout-item class="hehe-layoutItem" size="4">
-                                        <lightning-button label="鍑鸿揣" onclick={SaveE}></lightning-button>
+                                    <lightning-layout-item
+                                        class="hehe-layoutItem"
+                                        size="4"
+                                    >
+                                        <lightning-button
+                                            label="鍑鸿揣"
+                                            onclick={SaveE}
+                                        ></lightning-button>
                                     </lightning-layout-item>
                                 </template>
-                                <lightning-layout-item class="hehe-layoutItem" size="4">
+                                <lightning-layout-item
+                                    class="hehe-layoutItem"
+                                    size="4"
+                                >
                                 </lightning-layout-item>
                             </lightning-layout>
 
                             <template if:true={isShowInformation}>
-                                <div class="borderCss">
+                                <div class="borderCss" style="margin-top: 5px">
                                     <div class="headerDorderCss">
                                         <p style="font-size: 16px">
                                             <strong>鍑哄簱鍗曚俊鎭�</strong>
                                         </p>
                                     </div>
                                     <div style="padding: 10px">
-                                        <div lwc:dom="manual" class="resultDiv"></div>
+                                        <div
+                                            lwc:dom="manual"
+                                            class="resultDiv"
+                                        ></div>
                                         <div draggable="false">
-                                            <lightning-record-edit-form object-api-name="Consumable_order__c"
-                                                record-id={cocId}>
-                                                <lightning-layout multiple-rows="true">
-                                                    <lightning-layout-item class="hehe-layoutItem" flexibility="auto">
-                                                        <lightning-output-field
-                                                            field-name="Name"></lightning-output-field>
+                                            <lightning-record-edit-form
+                                                object-api-name="Consumable_order__c"
+                                                record-id={cocId}
+                                                onload={handleLoad2}
+                                            >
+                                                <lightning-layout
+                                                    multiple-rows="true"
+                                                >
+                                                    <lightning-layout-item
+                                                        size="3"
+                                                        padding="around-small"
+                                                    >
+                                                        <!-- <lightning-output-field field-name="Name"></lightning-output-field> -->
+                                                        <div
+                                                            class="slds-grid slds-grid_vertical-align-center"
+                                                        >
+                                                            <div
+                                                                class="slds-form-element__label"
+                                                                style="
+                                                                    padding: 0px;
+                                                                "
+                                                            >
+                                                                鍑哄簱鍗曞彿锛�
+                                                            </div>
+                                                            <lightning-output-field
+                                                                field-name="Name"
+                                                                variant="label-hidden"
+                                                            ></lightning-output-field>
+                                                        </div>
                                                     </lightning-layout-item>
-                                                    <lightning-layout-item class="hehe-layoutItem" flexibility="auto">
-                                                        <lightning-output-field
-                                                            field-name="ShipmentAccount__c"></lightning-output-field>
+                                                    <lightning-layout-item
+                                                        size="4"
+                                                        padding="around-small"
+                                                    >
+                                                        <!-- <lightning-output-field
+                                                            field-name="ShipmentAccount__c" class="hideHelpText"></lightning-output-field> -->
+                                                        <div
+                                                            class="slds-grid slds-grid_vertical-align-center"
+                                                        >
+                                                            <div
+                                                                class="slds-form-element__label"
+                                                                style="
+                                                                    padding: 0px;
+                                                                "
+                                                            >
+                                                                瀹㈡埛鍚嶏細
+                                                            </div>
+                                                            <lightning-output-field
+                                                                field-name="ShipmentAccount__c"
+                                                                variant="label-hidden"
+                                                            ></lightning-output-field>
+                                                        </div>
                                                     </lightning-layout-item>
-                                                    <lightning-layout-item class="hehe-layoutItem" flexibility="auto">
-                                                        <lightning-output-field
-                                                            field-name="Order_ForCustomerText__c"></lightning-output-field>
+                                                    <lightning-layout-item
+                                                        size="2"
+                                                        padding="around-small"
+                                                    >
+                                                        <!-- <lightning-output-field
+                                                            field-name="Order_ForCustomerText__c"></lightning-output-field> -->
+                                                        <div
+                                                            class="slds-grid slds-grid_vertical-align-center"
+                                                        >
+                                                            <div
+                                                                class="slds-form-element__label"
+                                                                style="
+                                                                    padding: 0px;
+                                                                "
+                                                            >
+                                                                绉戝锛�
+                                                            </div>
+                                                            <lightning-output-field
+                                                                field-name="Order_ForCustomerText__c"
+                                                                variant="label-hidden"
+                                                            ></lightning-output-field>
+                                                        </div>
                                                     </lightning-layout-item>
-                                                    <lightning-layout-item class="hehe-layoutItem" flexibility="auto">
-                                                        <lightning-output-field
-                                                            field-name="SummonsForDirction__c"></lightning-output-field>
+                                                    <lightning-layout-item
+                                                        size="2"
+                                                        padding="around-small"
+                                                    >
+                                                        <!-- <lightning-output-field
+                                                            field-name="SummonsForDirction__c"></lightning-output-field> -->
+                                                        <div
+                                                            class="slds-grid slds-grid_vertical-align-center"
+                                                        >
+                                                            <div
+                                                                class="slds-form-element__label"
+                                                                style="
+                                                                    padding: 0px;
+                                                                "
+                                                            >
+                                                                鐩殑锛�
+                                                            </div>
+                                                            <lightning-output-field
+                                                                field-name="SummonsForDirction__c"
+                                                                variant="label-hidden"
+                                                            ></lightning-output-field>
+                                                        </div>
                                                     </lightning-layout-item>
                                                 </lightning-layout>
                                             </lightning-record-edit-form>
@@ -718,22 +1319,65 @@
                                             </p>
                                         </div>
                                         <div style="padding: 10px">
-                                            <div lwc:dom="manual" class="resultDiv"></div>
+                                            <div
+                                                lwc:dom="manual"
+                                                class="resultDiv"
+                                            ></div>
                                             <div draggable="false">
-                                                <lightning-record-edit-form object-api-name="Consumable_order__c"
-                                                    record-id={cocId}>
-                                                    <lightning-layout multiple-rows="true">
-                                                        <lightning-layout-item class="hehe-layoutItem" size="6">
-                                                            <lightning-textarea name="Barcode" label="BarCode鍙�"
+                                                <lightning-record-edit-form
+                                                    object-api-name="Consumable_order__c"
+                                                    record-id={cocId}
+                                                >
+                                                    <lightning-layout
+                                                        multiple-rows="true"
+                                                    >
+                                                        <lightning-layout-item
+                                                            size="1"
+                                                        ></lightning-layout-item>
+                                                        <lightning-layout-item
+                                                            padding="around-small"
+                                                        >
+                                                            <!-- <lightning-textarea name="Barcode" label="BarCode鍙�"
                                                                 onchange={dataChange} variant="label-inline"
                                                                 data-field="Barcode"
-                                                                value={Barcode}></lightning-textarea>
+                                                                value={Barcode}></lightning-textarea> -->
+
+                                                            <div
+                                                                class="slds-grid"
+                                                            >
+                                                                <div
+                                                                    class="slds-form-element__label"
+                                                                >
+                                                                    BarCode鍙�
+                                                                </div>
+                                                                <lightning-textarea
+                                                                    name="Barcode"
+                                                                    label="BarCode鍙�"
+                                                                    onchange={dataChange}
+                                                                    variant="label-hidden"
+                                                                    data-field="Barcode"
+                                                                    value={Barcode}
+                                                                    style="
+                                                                        min-width: 400px;
+                                                                    "
+                                                                ></lightning-textarea>
+                                                            </div>
                                                         </lightning-layout-item>
-                                                        <lightning-layout-item class="hehe-layoutItem"
-                                                            size="1"></lightning-layout-item>
-                                                        <lightning-layout-item class="hehe-layoutItem" size="2">
-                                                            <lightning-button label="纭"
-                                                                onclick={SalesearchProductJs}></lightning-button>
+                                                        <lightning-layout-item
+                                                            padding="around-small"
+                                                        >
+                                                            <div
+                                                                class="slds-grid slds-grid_vertical-align-center"
+                                                            >
+                                                                <div
+                                                                    class="slds-form-element__label"
+                                                                >
+                                                                    <lightning-button
+                                                                        label="纭"
+                                                                        onclick={SalesearchProductJs}
+                                                                    ></lightning-button>
+                                                                </div>
+                                                            </div>
                                                         </lightning-layout-item>
                                                     </lightning-layout>
                                                 </lightning-record-edit-form>
@@ -749,10 +1393,21 @@
                                         </p>
                                     </div>
                                     <div style="padding: 10px">
-                                        <div lwc:dom="manual" class="resultDiv"></div>
+                                        <div
+                                            lwc:dom="manual"
+                                            class="resultDiv"
+                                        ></div>
                                         <div draggable="false">
-                                            <lightning-datatable key-field="id" data={salesData} columns={salesColumns}
-                                                hide-checkbox-column>
+                                            <lightning-datatable
+                                                key-field="id"
+                                                data={salesData}
+                                                columns={salesColumns}
+                                                hide-checkbox-column
+                                                style="
+                                                    word-wrap: break-word;
+                                                    word-break: break-all;
+                                                "
+                                            >
                                             </lightning-datatable>
                                         </div>
                                     </div>
@@ -765,29 +1420,58 @@
                                         </p>
                                     </div>
                                     <div style="padding: 10px">
-                                        <div lwc:dom="manual" class="resultDiv"></div>
+                                        <div
+                                            lwc:dom="manual"
+                                            class="resultDiv"
+                                        ></div>
                                         <div draggable="false">
-                                            <lightning-datatable key-field="id" data={salesErrorData}
-                                                columns={salesErrorColumns} hide-checkbox-column>
+                                            <lightning-datatable
+                                                key-field="id"
+                                                data={salesErrorData}
+                                                columns={salesErrorColumns}
+                                                hide-checkbox-column
+                                                style="
+                                                    word-wrap: break-word;
+                                                    word-break: break-all;
+                                                "
+                                            >
                                             </lightning-datatable>
                                         </div>
                                     </div>
                                 </div>
 
                                 <lightning-layout multiple-rows="true">
-                                    <lightning-layout-item class="hehe-layoutItem" size="4">
+                                    <lightning-layout-item
+                                        class="hehe-layoutItem"
+                                        size="4"
+                                    >
                                     </lightning-layout-item>
                                     <template if:true={isSales}>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
-                                            <lightning-button label="閿�鍞�" onclick={SaveP}></lightning-button>
+                                        <lightning-layout-item
+                                            class="hehe-layoutItem"
+                                            size="4"
+                                        >
+                                            <lightning-button
+                                                label="閿�鍞�"
+                                                onclick={SaveP}
+                                            ></lightning-button>
                                         </lightning-layout-item>
                                     </template>
                                     <template if:false={isSales}>
-                                        <lightning-layout-item class="hehe-layoutItem" size="4">
-                                            <lightning-button label="鍑鸿揣" onclick={SaveE}></lightning-button>
+                                        <lightning-layout-item
+                                            class="hehe-layoutItem"
+                                            size="4"
+                                        >
+                                            <lightning-button
+                                                label="鍑鸿揣"
+                                                onclick={SaveE}
+                                            ></lightning-button>
                                         </lightning-layout-item>
                                     </template>
-                                    <lightning-layout-item class="hehe-layoutItem" size="4">
+                                    <lightning-layout-item
+                                        class="hehe-layoutItem"
+                                        size="4"
+                                    >
                                     </lightning-layout-item>
                                 </lightning-layout>
                             </template>
@@ -797,4 +1481,4 @@
             </template>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
index 861ade4..09c106a 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
@@ -1,407 +1,414 @@
-import { LightningElement, wire, api, track } from "lwc";
-import init from "@salesforce/apex/LexSummonsCreatController.init";
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
-import searchConsumableorderdetails from "@salesforce/apex/LexSummonsCreatController.searchConsumableorderdetails";
-import PraseToPDF from "@salesforce/apex/LexSummonsCreatController.PraseToPDF";
-import apexSearch from "@salesforce/apex/LexSummonsCreatController.search";
-import saveFile from "@salesforce/apex/LexSummonsCreatController.saveFile";
-import getFiles from "@salesforce/apex/LexSummonsCreatController.getFiles";
-import GoodsDelivery from "@salesforce/apex/LexSummonsCreatController.GoodsDelivery";
-import DelConsumable from "@salesforce/apex/LexSummonsCreatController.DelConsumable";
-import categoryAllload from "@salesforce/apex/LexSummonsCreatController.categoryAllload";
-import categoryload from "@salesforce/apex/LexSummonsCreatController.categoryload";
-import GoodsDeliveryInit from "@salesforce/apex/LexSaleOrderController.GoodsDeliveryInit";
-import SearchPro from "@salesforce/apex/LexSaleOrderController.SearchPro";
-import ProdElivery from "@salesforce/apex/LexSaleOrderController.ProdElivery";
-import ProSale from "@salesforce/apex/LexSaleOrderController.ProSale";
-import save from "@salesforce/apex/LexSummonsCreatController.save";
-import OPPORTUNITY_OBJECT from "@salesforce/schema/Consumable_Orderdetails__c";
-import { getObjectInfo } from "lightning/uiObjectInfoApi";
-import hospitalInit from "@salesforce/apex/lexSearchAgencyHospitalController.init";
-import serContact from "@salesforce/apex/lexSearchAgencyHospitalController.serContact";
-import { NavigationMixin } from "lightning/navigation";
+import { LightningElement, wire, api, track } from 'lwc';
+import init from '@salesforce/apex/LexSummonsCreatController.init';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import searchConsumableorderdetails from '@salesforce/apex/LexSummonsCreatController.searchConsumableorderdetails';
+import PraseToPDF from '@salesforce/apex/LexSummonsCreatController.PraseToPDF';
+import apexSearch from '@salesforce/apex/LexSummonsCreatController.search';
+import saveFile from '@salesforce/apex/LexSummonsCreatController.saveFile';
+import getFiles from '@salesforce/apex/LexSummonsCreatController.getFiles';
+import GoodsDelivery from '@salesforce/apex/LexSummonsCreatController.GoodsDelivery';
+import DelConsumable from '@salesforce/apex/LexSummonsCreatController.DelConsumable';
+import categoryAllload from '@salesforce/apex/LexSummonsCreatController.categoryAllload';
+import categoryload from '@salesforce/apex/LexSummonsCreatController.categoryload';
+import GoodsDeliveryInit from '@salesforce/apex/LexSaleOrderController.GoodsDeliveryInit';
+import SearchPro from '@salesforce/apex/LexSaleOrderController.SearchPro';
+import ProdElivery from '@salesforce/apex/LexSaleOrderController.ProdElivery';
+import ProSale from '@salesforce/apex/LexSaleOrderController.ProSale';
+import save from '@salesforce/apex/LexSummonsCreatController.save';
+import OPPORTUNITY_OBJECT from '@salesforce/schema/Consumable_Orderdetails__c';
+import { getObjectInfo } from 'lightning/uiObjectInfoApi';
+import hospitalInit from '@salesforce/apex/lexSearchAgencyHospitalController.init';
+import serContact from '@salesforce/apex/lexSearchAgencyHospitalController.serContact';
+import { NavigationMixin } from 'lightning/navigation';
 
 export default class LexSummonsCreat extends NavigationMixin(LightningElement) {
     @track isShowSpinner = true;
     @track showResults = true;
     @track results = [
         {
-            Id: "1",
-            Name: "z",
+            Id: '1',
+            Name: 'z'
         },
         {
-            Id: "2",
-            Name: "h",
+            Id: '2',
+            Name: 'h'
         },
         {
-            Id: "3",
-            Name: "j",
-        },
+            Id: '3',
+            Name: 'j'
+        }
     ];
 
     @track COLS = [
         {
-            label: "Account Name",
-            type: "customName",
+            label: 'Account Name',
+            type: 'customName',
             typeAttributes: {
-                accountName: { fieldName: "Name" },
-            },
-        },
+                accountName: { fieldName: 'Name' }
+            }
+        }
     ];
     @track columns = [
         {
-            label: "娑堣�楀搧鍚嶇О",
-            fieldName: "Name__c",
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'Name__c',
             //hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
             //initialWidth : 100,
         },
         {
-            label: "瑙勬牸",
-            fieldName: "packinglist",
+            label: '瑙勬牸',
+            fieldName: 'packinglist',
             //initialWidth : 50,
             wrapText: true,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "CFDA鐘舵��",
-            fieldName: "SFDA_Status__c",
+            label: 'CFDA鐘舵��',
+            fieldName: 'SFDA_Status__c',
             //initialWidth : 100,
             wrapText: true,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "娉ㄥ唽璇佺紪鐮佸彿",
-            fieldName: "approbation_No",
+            label: '娉ㄥ唽璇佺紪鐮佸彿',
+            fieldName: 'approbation_No',
             //initialWidth : 150,
             wrapText: true,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "娉ㄥ唽璇佹晥鏈�",
+            label: '娉ㄥ唽璇佹晥鏈�',
             //initialWidth : 100,
             wrapText: true,
-            fieldName: "expiration_Date",
-            hideDefaultActions: true,
+            fieldName: 'expiration_Date',
+            hideDefaultActions: true
         },
         {
-            label: "绗�3鍒嗙被",
-            fieldName: "Category3__c",
+            label: '绗�3鍒嗙被',
+            fieldName: 'Category3__c',
             //initialWidth : 100,
             wrapText: true,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "绗�4鍒嗙被",
-            fieldName: "Category4__c",
+            label: '绗�4鍒嗙被',
+            fieldName: 'Category4__c',
             //initialWidth : 100,
             wrapText: true,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "绗�5鍒嗙被",
-            fieldName: "Category5__c",
+            label: '绗�5鍒嗙被',
+            fieldName: 'Category5__c',
             //initialWidth : 100,
             wrapText: true,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "鍗曚綅",
-            type: "customUnit",
+            label: '鍗曚綅',
+            type: 'customUnit',
             //initialWidth : 100,
             hideDefaultActions: true,
             typeAttributes: {
-                unitValue: { fieldName: "unitValue" },
-                unitOptions: { fieldName: "unitOptions" },
-                recordId: { fieldName: "recordId" },
-            },
+                unitValue: { fieldName: 'unitValue' },
+                unitOptions: { fieldName: 'unitOptions' },
+                recordId: { fieldName: 'recordId' }
+            }
         },
         {
-            label: "鍑鸿揣鏁伴噺",
-            type: "customShipment",
+            label: '鍑鸿揣鏁伴噺',
+            type: 'customShipment',
             //initialWidth : 150,
             hideDefaultActions: true,
             typeAttributes: {
-                recordId: { fieldName: "recordId" },
-                shipmentNumber: { fieldName: "shipmentNumber" },
-            },
+                recordId: { fieldName: 'recordId' },
+                shipmentNumber: { fieldName: 'shipmentNumber' }
+            }
         },
         {
-            label: "鍑鸿揣鍗曚环(鍏�)",
-            type: "customShipmentUnitPrice",
+            label: '鍑鸿揣鍗曚环(鍏�)',
+            type: 'customShipmentUnitPrice',
             //initialWidth : 150,
             hideDefaultActions: true,
             typeAttributes: {
-                recordId: { fieldName: "recordId" },
-                shippingUnitPrice: { fieldName: "shippingUnitPrice" },
-            },
+                recordId: { fieldName: 'recordId' },
+                shippingUnitPrice: { fieldName: 'shippingUnitPrice' }
+            }
         },
         {
-            label: "鍑鸿揣閲戦(鍏�)",
-            type: "customShipmentAmount",
+            label: '鍑鸿揣閲戦(鍏�)',
+            type: 'customShipmentAmount',
             //initialWidth : 120,
             hideDefaultActions: true,
             typeAttributes: {
-                shipmentAmount: { fieldName: "shipmentAmount" },
-            },
+                shipmentAmount: { fieldName: 'shipmentAmount' }
+            }
         },
         {
-            label: "鏈夋晥鏈熷唴搴撳瓨(鐩�)",
-            fieldName: "Boxnumber",
+            label: '鏈夋晥鏈熷唴搴撳瓨(鐩�)',
+            fieldName: 'Boxnumber',
             //initialWidth : 120,
             wrapText: true,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "鏈夋晥鏈熷唴搴撳瓨(涓�)",
-            fieldName: "Piecenumber",
+            label: '鏈夋晥鏈熷唴搴撳瓨(涓�)',
+            fieldName: 'Piecenumber',
             //initialWidth : 120,
             wrapText: true,
-            hideDefaultActions: true,
-        },
+            hideDefaultActions: true
+        }
     ];
     @track editColumns = [
         {
-            label: "娑堣�楀搧鍚嶇О",
-            fieldName: "Name__c",
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'Name__c',
             hideDefaultActions: true,
             initialWidth: 250,
+            wrapText: true
         },
         {
-            label: "瑙勬牸",
-            fieldName: "packinglist",
+            label: '瑙勬牸',
+            fieldName: 'packinglist',
             initialWidth: 50,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "CFDA鐘舵��",
-            fieldName: "SFDA_Status__c",
+            label: 'CFDA鐘舵��',
+            fieldName: 'SFDA_Status__c',
             initialWidth: 100,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "娉ㄥ唽璇佺紪鐮佸彿",
-            fieldName: "approbation_No",
+            label: '娉ㄥ唽璇佺紪鐮佸彿',
+            fieldName: 'approbation_No',
             initialWidth: 150,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "娉ㄥ唽璇佹晥鏈�",
+            label: '娉ㄥ唽璇佹晥鏈�',
             initialWidth: 100,
-            fieldName: "expiration_Date",
-            hideDefaultActions: true,
+            fieldName: 'expiration_Date',
+            hideDefaultActions: true
         },
         {
-            label: "绗�3鍒嗙被",
-            fieldName: "Category3__c",
+            label: '绗�3鍒嗙被',
+            fieldName: 'Category3__c',
             initialWidth: 100,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "绗�4鍒嗙被",
-            fieldName: "Category4__c",
+            label: '绗�4鍒嗙被',
+            fieldName: 'Category4__c',
             initialWidth: 100,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "绗�5鍒嗙被",
-            fieldName: "Category5__c",
+            label: '绗�5鍒嗙被',
+            fieldName: 'Category5__c',
             initialWidth: 100,
             hideDefaultActions: true,
-            sortable: true,
+            sortable: true
         },
         {
-            label: "鍗曚綅",
-            fieldName: "Box_Piece__c",
+            label: '鍗曚綅',
+            fieldName: 'Box_Piece__c',
             initialWidth: 100,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "鍑鸿揣鏁伴噺",
-            fieldName: "Shipment_Count__c",
+            label: '鍑鸿揣鏁伴噺',
+            fieldName: 'Shipment_Count__c',
             initialWidth: 150,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "鍑鸿揣鍗曚环(鍏�)",
-            fieldName: "Shipment_amount__c",
+            label: '鍑鸿揣鍗曚环(鍏�)',
+            fieldName: 'Shipment_amount__c',
+            type: 'number',
+            typeAttributes: {
+                minimumFractionDigits: 2
+            },
             initialWidth: 150,
-            hideDefaultActions: true,
-        },
+            hideDefaultActions: true
+        }
     ];
 
     @track hospitalList = [];
     @track hospitalColumns = [
         {
-            label: "鍖婚櫌鍚嶇О",
-            fieldName: "Name",
+            label: '鍖婚櫌鍚嶇О',
+            fieldName: 'Name',
             initialWidth: 400,
-            hideDefaultActions: true,
+            hideDefaultActions: true
         },
         {
-            label: "鐪佷唤",
-            fieldName: "stateMasterName",
-            hideDefaultActions: true,
+            label: '鐪佷唤',
+            fieldName: 'stateMasterName',
+            hideDefaultActions: true
         },
         {
-            label: "閫夋嫨",
-            fieldName: "Id1",
-            type: "button",
+            label: '閫夋嫨',
+            fieldName: 'Id1',
+            type: 'button',
             hideDefaultActions: true,
             typeAttributes: {
-                label: "閫夋嫨",
-                name: "Id2",
-                size: 1,
-            },
-        },
+                label: '閫夋嫨',
+                name: 'Id2',
+                size: 1
+            }
+        }
     ];
 
-    @track accountid = "";
+    @track accountid = '';
     @track consumableproductdetailsRecords = [];
-    @track SummonsStatus = "";
-    @track ESetid = "";
-    @track statusEdit = "";
+    @track SummonsStatus = '';
+    @track ESetid = '';
+    @track statusEdit = '';
     @track cocLwc = {};
     @track selectedRows = [];
-    @track ConsumableOut_report = "";
+    @track ConsumableOut_report = '';
     @track isMutualTransferGoods = false;
-    @track Barcode = "";
+    @track Barcode = '';
     @track summonsForDirction = '';
 
     @track consumableorderdetails2RecordsColumns = [
         {
-            label: "娑堣�楀搧鍚嶇О",
-            fieldName: "ProdName",
-            hideDefaultActions: true,
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'ProdName',
+            hideDefaultActions: true
         },
         {
-            label: "鎵规鍙�",
-            fieldName: "orderdetails2SerialLotNo__c",
-            hideDefaultActions: true,
+            label: '鎵规鍙�',
+            fieldName: 'orderdetails2SerialLotNo__c',
+            hideDefaultActions: true
         },
         {
-            label: "绠$悊缂栫爜",
-            fieldName: "orderdetails2TracingCode__c",
-            hideDefaultActions: true,
+            label: '绠$悊缂栫爜',
+            fieldName: 'orderdetails2TracingCode__c',
+            hideDefaultActions: true
         },
         {
-            label: "浣跨敤鏈熼檺",
-            fieldName: "orderdetails2Sterilization_limit__c",
-            hideDefaultActions: true,
-        },
+            label: '浣跨敤鏈熼檺',
+            fieldName: 'orderdetails2Sterilization_limit__c',
+            hideDefaultActions: true
+        }
     ];
     @track consumableorderdetails2Records = [];
 
     //鍑鸿揣/閿�鍞�
     @track salesColumns = [
         {
-            label: "娑堣�楀搧璁㈠崟",
-            fieldName: "Consumable_order_minor__c",
+            label: '娑堣�楀搧璁㈠崟',
+            fieldName: 'Consumable_order_minor__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "娑堣�楀搧鏄庣粏2鍚嶇О",
-            fieldName: "orderdetails2NameUrl",
-            type: "url",
+            label: '娑堣�楀搧鏄庣粏2鍚嶇О',
+            fieldName: 'orderdetails2NameUrl',
+            type: 'url',
             typeAttributes: {
-                label: { fieldName: "orderdetails2Name" },
-                target: "_blank",
+                label: { fieldName: 'orderdetails2Name' },
+                target: '_blank'
             },
             hideDefaultActions: true,
             wrapText: true,
+            initialWidth: 240
         },
         {
-            label: "鍗曚綅",
-            fieldName: "Box_Piece__c",
+            label: '鍗曚綅',
+            fieldName: 'Box_Piece__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "娑堣�楀搧鍚嶇О",
-            fieldName: "ProdName",
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'ProdName',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "鍙戣揣鏃ユ湡",
-            fieldName: "Deliver_date__c",
+            label: '鍙戣揣鏃ユ湡',
+            fieldName: 'Deliver_date__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "BarCode",
-            fieldName: "Bar_Code__c",
+            label: 'BarCode',
+            fieldName: 'Bar_Code__c',
             hideDefaultActions: true,
             wrapText: true,
+            initialWidth: 500
         },
         {
-            label: "浣跨敤鏈熼檺",
-            fieldName: "Sterilization_limit__c",
+            label: '浣跨敤鏈熼檺',
+            fieldName: 'Sterilization_limit__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "鍑鸿揣鏁伴噺",
-            fieldName: "outboundCount",
+            label: '鍑鸿揣鏁伴噺',
+            fieldName: 'outboundCount',
             hideDefaultActions: true,
-            wrapText: true,
-        },
+            wrapText: true
+        }
     ];
     @track salesData = [];
 
     @track salesErrorColumns = [
         {
-            label: "娑堣�楀搧璁㈠崟",
-            fieldName: "Consumable_order_minor__c",
+            label: '娑堣�楀搧璁㈠崟',
+            fieldName: 'Consumable_order_minor__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "娑堣�楀搧鏄庣粏2鍚嶇О",
-            fieldName: "orderdetails2Name",
+            label: '娑堣�楀搧鏄庣粏2鍚嶇О',
+            fieldName: 'orderdetails2Name',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "娑堣�楀搧鍚嶇О",
-            fieldName: "ProdName",
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'ProdName',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "鍗曚綅",
-            fieldName: "Box_Piece__c",
+            label: '鍗曚綅',
+            fieldName: 'Box_Piece__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "BarCode",
-            fieldName: "Bar_Code__c",
-            hideDefaultActions: true,
+            label: 'BarCode',
+            fieldName: 'Bar_Code__c',
+            hideDefaultActions: true
         },
         {
-            label: "浣跨敤鏈熼檺",
-            fieldName: "Sterilization_limit__c",
+            label: '浣跨敤鏈熼檺',
+            fieldName: 'Sterilization_limit__c',
             hideDefaultActions: true,
-            wrapText: true,
+            wrapText: true
         },
         {
-            label: "閿欒鍘熷洜",
-            fieldName: "ErrorReason",
+            label: '閿欒鍘熷洜',
+            fieldName: 'ErrorReason',
             hideDefaultActions: true,
-            wrapText: true,
-        },
+            wrapText: true
+        }
     ];
     @track salesErrorData = [];
-    @track salesAccountName = "";
-    @track salesUserWorkLocation = "";
-    @track salesAccountid = "";
+    @track salesAccountName = '';
+    @track salesUserWorkLocation = '';
+    @track salesAccountid = '';
     @track salesOrderdetails = [];
     @track salesCoc = {};
     @track salesOrderpieceorboxMap;
@@ -422,6 +429,8 @@
     @track isBarcode = true;
     @track isShowInformation = true;
     @track isShowOutboundProductDetails = false;
+    @track showAttPop = false;
+    @track showPopSpinner = false;
 
     //disable鎸夐挳
     @track isEditDisabled = false;
@@ -432,55 +441,55 @@
     @track isDeleteDisabled = false;
 
     //鍑哄簱鍗曚俊鎭�
-    @track cocId = "";
+    @track cocId = '';
     @track EditAble = false;
     @track summonsStatusPriceNotDetermined = false;
     @track isSummonsForDirctionTwoShow = false;
     @track isSummonsFlag = false;
     @track isConInvoiceShow = false;
-    @track sumPrice = "";
+    @track sumPrice = '';
     @track isSearchShow = false;
     @track Existarrive = false;
-    @track Category3 = "";
+    @track Category3 = '';
     @track category3Options = [];
-    @track Category4 = "";
+    @track Category4 = '';
     @track category4Options = [];
-    @track Category5 = "";
+    @track Category5 = '';
     @track category5Options = [];
     //鍙戠エid
     @track invoiceId = '';
 
     //浜岀骇缁忛攢鍟�
-    @track secondaryDistributor = "";
+    @track secondaryDistributor = '';
     @track secondaryDistributorOptions = [];
     @track isDisabledSecondaryDistributor = false;
 
     //缁忛攢鍟嗗綍鍏�
-    @track ForDealerText = "";
+    @track ForDealerText = '';
     @track isDisabledForDealerText = false;
 
     //瀹㈡埛鍚�
     @track isModalOpen = false;
-    @track HospitalName = "";
-    @track searchHospitalName = "";
-    @track OECId = "";
+    @track HospitalName = '';
+    @track searchHospitalName = '';
+    @track OECId = '';
     @track isDisabledHospitalName = false;
 
     //绉戝
-    @track ForCustomerText = "";
+    @track ForCustomerText = '';
     @track isDisabledForCustomerText = false;
 
     //娌℃湁纭畾浠锋牸
     @track NoConfirmedPrice = false;
 
     //娑堣�楀搧鍚嶇О
-    @track consumableName = "";
+    @track consumableName = '';
 
-    @track agencyProType = "";
-    @track accountName = "";
-    @track userWorkLocation = "";
+    @track agencyProType = '';
+    @track accountName = '';
+    @track userWorkLocation = '';
     @track OutPattern__c = false;
-    @track outOutPattern = "";
+    @track outOutPattern = '';
 
     //鍑哄簱鍗曟槑缁�
     @track showTable = false;
@@ -488,41 +497,37 @@
     @track isSelectShow = false;
     @track hidecheckboxcolumn = false;
     @track is345Show = false;
-    @track arriveorder = "";
+    @track arriveorder = '';
     @track hasHosPro = false;
-    @track InvoiceProNotLabel = "";
-    @track RrturnProLabel = "";
-    @track InvoicedLabel = "";
+    @track InvoiceProNotLabel = '';
+    @track RrturnProLabel = '';
+    @track InvoicedLabel = '';
     @track outOutPatternOptionList = [];
 
     //鏂囦欢涓婁紶
     @track showLoadingSpinner = false;
-    @track UploadFile = "Upload File";
-    @track fileName = "";
+    @track UploadFile = 'Upload File';
+    @track fileName = '';
     @track fileData = [];
     @track fileColumns = [
         {
-            label: "鏍囬",
-            fieldName: "url",
-            type: "url",
-            typeAttributes: { label: { fieldName: "Title" }, target: "_blank" },
-            hideDefaultActions: true,
+            label: '鏍囬',
+            fieldName: 'url',
+            type: 'url',
+            typeAttributes: { label: { fieldName: 'Title' }, target: '_blank' },
+            hideDefaultActions: true
         },
         {
-            label: "鍒涘缓浜�",
-            fieldName: "CreatedByName",
-            hideDefaultActions: true,
-        },
+            label: '鍒涘缓浜�',
+            fieldName: 'CreatedByName',
+            hideDefaultActions: true
+        }
     ];
     filesUploaded = [];
     fileContents;
     fileReader;
     content;
     MAX_FILE_SIZE = 1500000;
-
-    get acceptedFormats() {
-        return [".xlsx"];
-    }
 
     //InvoiceProNotLabel    RrturnProLabel  InvoicedLabel
     @wire(getObjectInfo, { objectApiName: OPPORTUNITY_OBJECT })
@@ -531,16 +536,16 @@
             this.InvoiceProNotLabel = data.fields.InvoiceProNot_count__c.label;
             this.RrturnProLabel = data.fields.RrturnPro_count__c.label;
             this.InvoicedLabel = data.fields.Invoiced_Procount__c.label;
-            console.log("this.InvoiceProNotLabel = " + this.InvoiceProNotLabel);
-            console.log("this.RrturnProLabel = " + this.RrturnProLabel);
-            console.log("this.InvoicedLabel = " + this.InvoicedLabel);
+            console.log('this.InvoiceProNotLabel = ' + this.InvoiceProNotLabel);
+            console.log('this.RrturnProLabel = ' + this.RrturnProLabel);
+            console.log('this.InvoicedLabel = ' + this.InvoicedLabel);
         }
     }
 
     //鑾峰彇閾炬帴鍙傛暟
     getQueryString(name) {
-        console.log("getQueryString name " + name);
-        let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        console.log('getQueryString name ' + name);
+        let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
         let r = window.location.search.substr(1).match(reg);
         if (r != null) {
             return decodeURIComponent(r[2]);
@@ -548,396 +553,491 @@
         return null;
     }
     connectedCallback() {
-        console.log("connectedCallback LexSummonsCreat");
-        this.ESetid = this.getQueryString("ESetid");
-        this.ESetid = this.ESetid == null ? "" : this.ESetid;
+        console.log('connectedCallback LexSummonsCreat');
+        this.ESetid = this.getQueryString('ESetid');
+        this.ESetid = this.ESetid == null ? '' : this.ESetid;
         //statusEdit
-        this.statusEdit = this.getQueryString("KeyWords");
-        this.statusEdit = this.statusEdit == null ? "" : this.statusEdit;
-        console.log("this.ESetid = " + this.ESetid);
-        console.log("this.statusEdit = " + this.statusEdit);
-        if (this.ESetid == "") {
+        this.statusEdit = this.getQueryString('KeyWords');
+        this.statusEdit = this.statusEdit == null ? '' : this.statusEdit;
+        console.log('this.ESetid = ' + this.ESetid);
+        console.log('this.statusEdit = ' + this.statusEdit);
+        if (this.ESetid == '') {
             this.isShowInformation = false;
         }
-        console.log("init LexSummonsCreat");
+        console.log('init LexSummonsCreat');
         init({
             ESetidJs: this.ESetid,
             statusEdit: this.statusEdit
-        }).then((r) => {
-            r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
+        })
+            .then((r) => {
+                r = JSON.parse(JSON.stringify(r));
+                console.log('r = ' + JSON.stringify(r));
 
-            if (r.status == "Success") {
-                this.OECId = r.entity.HospitalInfo == null ? '' : r.entity.HospitalInfo;
-                console.log("this.OECId = " + this.OECId);
-                this.ConsumableOut_report = r.entity.ConsumableOut_report;
-                console.log("this.ConsumableOut_report = " + this.ConsumableOut_report);
-                this.accountid = r.entity.accountid;
-                this.consumableproductdetailsRecords =
-                    r.entity.consumableproductdetailsRecords;
-                this.accountName = r.entity.accountName;
-                this.agencyProType = r.entity.agencyProType;
-                this.accountName = r.entity.accountName;
-                this.userWorkLocation = r.entity.userWorkLocation;
-                this.EditAble = r.entity.EditAble;
-                this.consumableorderdetails2Records =
-                    r.entity.consumableorderdetails2Records;
-                for (var i in this.consumableorderdetails2Records) {
-                    this.consumableorderdetails2Records[i]["ProdName"] =
-                        this.consumableorderdetails2Records[i].Prod.Name;
-                    this.consumableorderdetails2Records[i][
-                        "orderdetails2SerialLotNo__c"
-                    ] =
-                        this.consumableorderdetails2Records[i].orderdetails2.SerialLotNo__c;
-                    this.consumableorderdetails2Records[i][
-                        "orderdetails2TracingCode__c"
-                    ] =
-                        this.consumableorderdetails2Records[i].orderdetails2.TracingCode__c;
-                    this.consumableorderdetails2Records[i][
-                        "orderdetails2Sterilization_limit__c"
-                    ] =
-                        this.consumableorderdetails2Records[
-                            i
-                        ].orderdetails2.Sterilization_limit__c;
-                }
-                this.isShowOutboundProductDetails =
-                    r.entity.consumableorderdetails2Count > 0 ? true : false;
-                console.log("this.agencyProType = " + this.agencyProType);
-                console.log("this.EditAble = " + this.EditAble);
-                //鏌ヨ闄勪欢
-                if (!this.EditAble) this.getFiles();
-                //绗�3鍒嗙被
-                for (var key in r.entity.categoryOptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.categoryOptionMap[key];
-                    object["value"] = key;
-                    this.category3Options.push(object);
-                }
-                console.log("this.category3Options = " + JSON.stringify(this.category3Options));
-                //绗�4鍒嗙被
-                for (var key in r.entity.category4OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category4OptionMap[key];
-                    object["value"] = key;
-                    this.category4Options.push(object);
-                }
-                console.log("this.category4Options = " + this.category4Options);
-                //绗�5鍒嗙被
-                for (var key in r.entity.category5OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category5OptionMap[key];
-                    object["value"] = key;
-                    this.category5Options.push(object);
-                }
-                console.log("this.category5Options = " + this.category5Options);
-
-                this.data = r.entity.pageRecords;
-                console.log("this.data start = " + JSON.stringify(this.data));
-                for (var i in this.data) {
-                    let unitOptions = [];
-                    for (var key in this.data[i].boxorpieceMap) {
-                        let unitOption = {};
-                        unitOption["label"] = this.data[i].boxorpieceMap[key];
-                        unitOption["value"] = key;
-                        unitOptions.push(unitOption);
+                if (r.status == 'Success') {
+                    this.OECId =
+                        r.entity.HospitalInfo == null
+                            ? ''
+                            : r.entity.HospitalInfo;
+                    console.log('this.OECId = ' + this.OECId);
+                    this.ConsumableOut_report = r.entity.ConsumableOut_report;
+                    console.log(
+                        'this.ConsumableOut_report = ' +
+                            this.ConsumableOut_report
+                    );
+                    this.accountid = r.entity.accountid;
+                    this.consumableproductdetailsRecords =
+                        r.entity.consumableproductdetailsRecords;
+                    this.accountName = r.entity.accountName;
+                    this.agencyProType = r.entity.agencyProType;
+                    this.accountName = r.entity.accountName;
+                    this.userWorkLocation = r.entity.userWorkLocation;
+                    this.EditAble = r.entity.EditAble;
+                    this.consumableorderdetails2Records =
+                        r.entity.consumableorderdetails2Records;
+                    for (var i in this.consumableorderdetails2Records) {
+                        this.consumableorderdetails2Records[i]['ProdName'] =
+                            this.consumableorderdetails2Records[i].Prod.Name;
+                        this.consumableorderdetails2Records[i][
+                            'orderdetails2SerialLotNo__c'
+                        ] =
+                            this.consumableorderdetails2Records[
+                                i
+                            ].orderdetails2.SerialLotNo__c;
+                        this.consumableorderdetails2Records[i][
+                            'orderdetails2TracingCode__c'
+                        ] =
+                            this.consumableorderdetails2Records[
+                                i
+                            ].orderdetails2.TracingCode__c;
+                        this.consumableorderdetails2Records[i][
+                            'orderdetails2Sterilization_limit__c'
+                        ] =
+                            this.consumableorderdetails2Records[
+                                i
+                            ].orderdetails2.Sterilization_limit__c;
                     }
-                    this.data[i]["unitOptions"] = unitOptions;
-                    this.data[i]["unitValue"] = this.data[i]["unitValue"] == null ? unitOptions[0].value : this.data[i]["unitValue"];
-                    if (this.EditAble) {
-                        this.data[i].orderdetails1["Box_Piece__c"] = this.data[i].orderdetails1["Box_Piece__c"] == null ? unitOptions[0].value : this.data[i].orderdetails1["Box_Piece__c"];
-                        this.data[i].orderdetails1["Shipment_Count__c"] = this.data[i].orderdetails1["Shipment_Count__c"] == null ? 0 : this.data[i].orderdetails1["Shipment_Count__c"];
-                        this.data[i].orderdetails1["Delivery_List_RMB__c"] = this.data[i].orderdetails1["Delivery_List_RMB__c"] == null ? 0.0 : this.data[i].orderdetails1["Delivery_List_RMB__c"];
-                    } else {
-                        this.data[i]["InvoiceProNot_count__c"] =
-                            this.data[i].orderdetails1.InvoiceProNot_count__c;
-                        this.data[i]["RrturnPro_count__c"] =
-                            this.data[i].orderdetails1.RrturnPro_count__c;
-                        this.data[i]["Invoiced_Procount__c"] =
-                            this.data[i].orderdetails1.Invoiced_Procount__c;
-                    }
-                    // this.data[i]["shipmentNumber"] = 0;
-                    // this.data[i]["shippingUnitPrice"] = 0.0;
-                    this.data[i]["shipmentNumber"] = this.data[i].orderdetails1["Shipment_Count__c"];
-                    this.data[i]["shippingUnitPrice"] = this.data[i].orderdetails1["Delivery_List_RMB__c"];
-
-                    this.data[i]["recordId"] = this.data[i].Prod.Id;
-                    this.data[i]["Id"] = this.data[i].Prod.Id;
-                    this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
-                    this.data[i]["SFDA_Status__c"] = this.data[i].Prod.SFDA_Status__c;
-                    this.data[i]["Category3__c"] = this.data[i].Prod.Category3__c;
-                    this.data[i]["Category4__c"] = this.data[i].Prod.Category4__c;
-                    this.data[i]["Category5__c"] = this.data[i].Prod.Category5__c;
-                    this.data[i]["Box_Piece__c"] = this.data[i].orderdetails1.Box_Piece__c;
-                    this.data[i]["shipmentAmount"] = this.data[i].orderdetails1.Shipment_amount__c;
-                    this.data[i]["Shipment_amount__c"] = this.data[i].orderdetails1.Shipment_amount__c;
-                    this.data[i]["Shipment_Count__c"] = this.data[i].orderdetails1.Shipment_Count__c;
-
-                    if (this.data[i]['check']) {
-                        this.selectedRows.push(this.data[i].Id);
-                    }
-
-                }
-                console.log("this.data = " + JSON.stringify(this.data));
-                //show
-                if (r.entity.EditDelCommitBtnDisabled || r.entity.EditAble) {
-                    this.isSaveShow = true;
-                } else {
-                    this.isEditShow = true;
-                    this.isDeliveryShow = true;
-                    this.isOpenToInvoiceShow = true;
-                    this.isPraseToPDFShow = true;
-                    this.isOpenReportShow = true;
-                    this.isDeleteShow = true;
-                }
-
-                this.Existarrive = r.entity.Existarrive;
-
-                console.log("this.EditAble = " + this.EditAble);
-                this.hasHosPro = r.entity.hasHosPro;
-                //disable
-
-                if (Object.values(r.entity.coc).length > 0) {
-                    this.cocLwc = r.entity.coc;
-                    console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
-                    var coc = r.entity.coc;
-                    this.cocId = coc.Id;
-                    console.log('cocId = ' + this.cocId);
-                    coc.SummonsStatus = coc.SummonsStatus_c__c;
-                    if (coc.SummonsStatus_c__c == "宸插畬鎴�") {
-                        this.isEditDisabled = true;
-                    }
-                    if (
-                        coc.SummonsStatus_c__c == "鎵瑰噯" ||
-                        coc.SummonsStatus_c__c == "宸查攢鍞緟涓婁紶绾冲搧涔�" ||
-                        coc.SummonsStatus_c__c == "鍑哄簱鍗曞凡鎵撳嵃" ||
-                        coc.SummonsStatus_c__c == "宸插畬鎴�"
-                    ) {
-                        this.isDeliveryDisabled = true;
-                    }
-                    if (
-                        ((coc.Billed_Status__c != "鍏ㄩ儴寮�绁�" &&
-                            coc.SummonsStatus_c__c == "宸插畬鎴�") ||
-                            coc.Onchange_order__c == true) &&
-                        coc.SummonsForDirction__c != "浜掔浉璋冭揣"
-                    ) {
-                        this.isOpenToInvoiceDisabled = false;
-                    }
-                    if (
-                        coc.SummonsStatus_c__c == "宸查攢鍞緟涓婁紶绾冲搧涔�" ||
-                        coc.SummonsStatus_c__c == "鎵瑰噯" ||
-                        coc.SummonsStatus_c__c == "鍑哄簱鍗曞凡鎵撳嵃" ||
-                        coc.SummonsStatus_c__c == "鑽夋涓�"
-                    ) {
-                        this.isPraseToPDFDisabled = false;
-                    }
-                    if (
-                        coc.Billed_Status__c != "杩樻病寮�绁�" ||
-                        coc.SummonsStatus_c__c == "宸插畬鎴�"
-                    ) {
-                        this.isOpenReportDisabled = false;
-                    }
-                    if (
-                        coc.SummonsStatus_c__c == "宸查攢鍞緟涓婁紶绾冲搧涔�" ||
-                        coc.SummonsStatus_c__c == "浠锋牸鏈畾" ||
-                        coc.SummonsStatus_c__c == "鎵瑰噯" ||
-                        coc.SummonsStatus_c__c == "鍑哄簱鍗曞凡鎵撳嵃" ||
-                        coc.SummonsStatus_c__c == "宸插畬鎴�"
-                    ) {
-                        this.isDeleteDisabled = true;
-                    }
-                    this.isConInvoiceShow =
-                        coc.SummonsStatus_c__c == "宸插畬鎴�" &&
-                            coc.SummonsForDirction__c != "浜掔浉璋冭揣"
+                    this.isShowOutboundProductDetails =
+                        r.entity.consumableorderdetails2Count > 0
                             ? true
                             : false;
-                    this.summonsStatusPriceNotDetermined =
-                        coc.SummonsStatus_c__c == "浠锋牸鏈畾" ? true : false;
-                    this.isSummonsForDirctionTwoShow =
-                        coc.SummonsForDirction__c == "閿�鍞粰浜岀骇缁忛攢鍟�" ? true : false;
-                }
-                this.isSearchShow =
-                    !this.Existarrive &&
-                        r.entity.coc.SummonsStatus_c__c != "浠锋牸鏈畾" &&
-                        r.entity.EditAble
-                        ? true
-                        : false;
-                this.hidecheckboxcolumn = !this.isSearchShow;
-                this.arriveorder = r.entity.arriveorder;
-                this.is345Show =
-                    this.arriveorder == "" && this.Existarrive == false && this.EditAble
-                        ? true
-                        : false;
-                //濡傛灉涓嶆樉绀�345鍒嗙被锛宑olumns閲岄潰鍒犻櫎3锛�4锛�5鍒嗙被
-                if (!this.is345Show) {
-                    for (var i = 0; i < this.columns.length; i++) {
-                        if (this.columns[i].label == "绗�3鍒嗙被") {
-                            this.columns.splice(i, 1);
-                        }
+                    console.log('this.agencyProType = ' + this.agencyProType);
+                    console.log('this.EditAble = ' + this.EditAble);
+                    //鏌ヨ闄勪欢
+                    if (!this.EditAble) this.getFiles();
+                    //绗�3鍒嗙被
+                    for (var key in r.entity.categoryOptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.categoryOptionMap[key];
+                        object['value'] = key;
+                        this.category3Options.push(object);
                     }
-                    for (var i = 0; i < this.columns.length; i++) {
-                        if (this.columns[i].label == "绗�4鍒嗙被") {
-                            this.columns.splice(i, 1);
-                        }
+                    console.log(
+                        'this.category3Options = ' +
+                            JSON.stringify(this.category3Options)
+                    );
+                    //绗�4鍒嗙被
+                    for (var key in r.entity.category4OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category4OptionMap[key];
+                        object['value'] = key;
+                        this.category4Options.push(object);
                     }
-                    for (var i = 0; i < this.columns.length; i++) {
-                        if (this.columns[i].label == "绗�5鍒嗙被") {
-                            this.columns.splice(i, 1);
-                        }
+                    console.log(
+                        'this.category4Options = ' + this.category4Options
+                    );
+                    //绗�5鍒嗙被
+                    for (var key in r.entity.category5OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category5OptionMap[key];
+                        object['value'] = key;
+                        this.category5Options.push(object);
                     }
-                    for (var i = 0; i < this.editColumns.length; i++) {
-                        if (this.editColumns[i].label == "绗�3鍒嗙被") {
-                            this.editColumns.splice(i, 1);
-                        }
-                    }
-                    for (var i = 0; i < this.editColumns.length; i++) {
-                        if (this.editColumns[i].label == "绗�4鍒嗙被") {
-                            this.editColumns.splice(i, 1);
-                        }
-                    }
-                    for (var i = 0; i < this.editColumns.length; i++) {
-                        if (this.editColumns[i].label == "绗�5鍒嗙被") {
-                            this.editColumns.splice(i, 1);
-                        }
-                    }
-                }
-                //濡傛灉EditAble==false锛屽垹闄� 鍑鸿揣閲戦(鍏�) 鏈夋晥鏈熷唴搴撳瓨(鐩�) 鏈夋晥鏈熷唴搴撳瓨(涓�) 3鍒� 灞曠ず 杩樻病鍙戠エ鏁伴噺 杩斿搧鏁伴噺 宸插彂绁ㄦ暟閲�
-                if (!this.EditAble) {
-                    let object1 = {
-                        label: this.InvoiceProNotLabel,
-                        fieldName: "InvoiceProNot_count__c",
-                        hideDefaultActions: true,
-                    };
-                    let object2 = {
-                        label: this.RrturnProLabel,
-                        fieldName: "RrturnPro_count__c",
-                        hideDefaultActions: true,
-                    };
-                    let object3 = {
-                        label: this.InvoicedLabel,
-                        fieldName: "Invoiced_Procount__c",
-                        hideDefaultActions: true,
-                    };
-                    this.editColumns.push(object1);
-                    this.editColumns.push(object2);
-                    this.editColumns.push(object3);
-                } else {
-                    this.ForCustomerText = this.cocLwc.Order_ForCustomerText__c;
-                    console.log('EditAble = true this.ForCustomerText = ' + this.ForCustomerText);
-                    this.summonsForDirction = this.cocLwc.SummonsForDirction__c;
-                    console.log('EditAble = true this.summonsForDirction = ' + this.summonsForDirction);
-                    let value = this.summonsForDirction;
-                    switch (value) {
-                        case "鐩存帴閿�鍞粰鍖婚櫌":
-                            this.isDisabledHospitalName = false;
-                            this.isDisabledForCustomerText = false;
-                            this.secondaryDistributor = "";
-                            this.ForDealerText = "";
-                            this.isDisabledForDealerText = true;
-                            this.isDisabledSecondaryDistributor = true;
-                            break;
-                        case "鍖婚櫌璇曠敤":
-                            this.isDisabledHospitalName = false;
-                            this.isDisabledForCustomerText = false;
-                            this.isDisabledForDealerText = false;
-                            this.isDisabledSecondaryDistributor = false;
-                            break;
-                        case "閿�鍞粰浜岀骇缁忛攢鍟�":
-                            this.isDisabledHospitalName = false;
-                            this.isDisabledForCustomerText = false;
-                            this.isDisabledForDealerText = false;
-                            this.isDisabledSecondaryDistributor = false;
-                            break;
-                        case "浜掔浉璋冭揣":
-                            this.isDisabledHospitalName = true;
-                            this.HospitalName = "";
-                            this.OECId = "";
-                            this.isDisabledForCustomerText = true;
-                            this.ForCustomerText = "";
-                            this.isDisabledForDealerText = false;
-                            this.isDisabledSecondaryDistributor = false;
-                            this.isMutualTransferGoods = true;
-                            break;
-                        default:
-                            this.isDisabledHospitalName = false;
-                            this.isDisabledForCustomerText = false;
-                            this.isDisabledForDealerText = false;
-                            this.isDisabledSecondaryDistributor = false;
-                    }
-                }
+                    console.log(
+                        'this.category5Options = ' + this.category5Options
+                    );
 
-                //濡傛灉hasHosPro = true 鍖婚櫌鐗逛环
-                if (this.hasHosPro) {
-                    let object1 = {
-                        label: "鍖婚櫌鐗逛环",
-                        fieldName: "InvoiceProNot_count__c",
-                        hideDefaultActions: true,
-                    };
-                    this.columns.push(object1);
-                    this.editColumns.push(object1);
+                    this.data = r.entity.pageRecords;
+                    console.log(
+                        'this.data start = ' + JSON.stringify(this.data)
+                    );
+                    for (var i in this.data) {
+                        let unitOptions = [];
+                        for (var key in this.data[i].boxorpieceMap) {
+                            let unitOption = {};
+                            unitOption['label'] =
+                                this.data[i].boxorpieceMap[key];
+                            unitOption['value'] = key;
+                            unitOptions.push(unitOption);
+                        }
+                        this.data[i]['unitOptions'] = unitOptions;
+                        this.data[i]['unitValue'] =
+                            this.data[i]['unitValue'] == null
+                                ? unitOptions[0].value
+                                : this.data[i]['unitValue'];
+                        if (this.EditAble) {
+                            this.data[i].orderdetails1['Box_Piece__c'] =
+                                this.data[i].orderdetails1['Box_Piece__c'] ==
+                                null
+                                    ? unitOptions[0].value
+                                    : this.data[i].orderdetails1[
+                                          'Box_Piece__c'
+                                      ];
+                            this.data[i].orderdetails1['Shipment_Count__c'] =
+                                this.data[i].orderdetails1[
+                                    'Shipment_Count__c'
+                                ] == null
+                                    ? 0
+                                    : this.data[i].orderdetails1[
+                                          'Shipment_Count__c'
+                                      ];
+                            this.data[i].orderdetails1['Delivery_List_RMB__c'] =
+                                this.data[i].orderdetails1[
+                                    'Delivery_List_RMB__c'
+                                ] == null
+                                    ? 0.0
+                                    : this.data[i].orderdetails1[
+                                          'Delivery_List_RMB__c'
+                                      ];
+                        } else {
+                            this.data[i]['InvoiceProNot_count__c'] =
+                                this.data[
+                                    i
+                                ].orderdetails1.InvoiceProNot_count__c;
+                            this.data[i]['RrturnPro_count__c'] =
+                                this.data[i].orderdetails1.RrturnPro_count__c;
+                            this.data[i]['Invoiced_Procount__c'] =
+                                this.data[i].orderdetails1.Invoiced_Procount__c;
+                        }
+                        // this.data[i]["shipmentNumber"] = 0;
+                        // this.data[i]["shippingUnitPrice"] = 0.0;
+                        //this.data[i]["shipmentNumber"] = this.data[i].orderdetails1["Shipment_Count__c"] == 0 ? '' : this.data[i].orderdetails1["Shipment_Count__c"];
+                        //this.data[i]["shippingUnitPrice"] = this.data[i].orderdetails1["Delivery_List_RMB__c"] == 0 ? '' : this.data[i].orderdetails1["Delivery_List_RMB__c"];
+                        this.data[i]['shipmentNumber'] =
+                            this.data[i].orderdetails1['Shipment_Count__c'];
+                        this.data[i]['shippingUnitPrice'] =
+                            this.data[i].orderdetails1['Delivery_List_RMB__c'];
+
+                        this.data[i]['recordId'] = this.data[i].Prod.Id;
+                        this.data[i]['Id'] = this.data[i].Prod.Id;
+                        this.data[i]['Name__c'] = this.data[i].Prod.Name__c;
+                        this.data[i]['SFDA_Status__c'] =
+                            this.data[i].Prod.SFDA_Status__c;
+                        this.data[i]['Category3__c'] =
+                            this.data[i].Prod.Category3__c;
+                        this.data[i]['Category4__c'] =
+                            this.data[i].Prod.Category4__c;
+                        this.data[i]['Category5__c'] =
+                            this.data[i].Prod.Category5__c;
+                        this.data[i]['Box_Piece__c'] =
+                            this.data[i].orderdetails1.Box_Piece__c;
+                        this.data[i]['shipmentAmount'] =
+                            this.data[i].orderdetails1.Shipment_amount__c;
+                        this.data[i]['Shipment_amount__c'] =
+                            this.data[i].orderdetails1.Shipment_amount__c;
+                        this.data[i]['Shipment_Count__c'] =
+                            this.data[i].orderdetails1.Shipment_Count__c;
+
+                        if (this.data[i]['check']) {
+                            this.selectedRows.push(this.data[i].Id);
+                        }
+                    }
+                    console.log('this.data = ' + JSON.stringify(this.data));
+                    //show
+                    if (
+                        r.entity.EditDelCommitBtnDisabled ||
+                        r.entity.EditAble
+                    ) {
+                        this.isSaveShow = true;
+                    } else {
+                        this.isEditShow = true;
+                        this.isDeliveryShow = true;
+                        this.isOpenToInvoiceShow = true;
+                        this.isPraseToPDFShow = true;
+                        this.isOpenReportShow = true;
+                        this.isDeleteShow = true;
+                    }
+
+                    this.Existarrive = r.entity.Existarrive;
+
+                    console.log('this.EditAble = ' + this.EditAble);
+                    this.hasHosPro = r.entity.hasHosPro;
+                    //disable
+
+                    if (Object.values(r.entity.coc).length > 0) {
+                        this.cocLwc = r.entity.coc;
+                        console.log(
+                            'this.cocLwc = ' + JSON.stringify(this.cocLwc)
+                        );
+                        var coc = r.entity.coc;
+                        this.cocId = coc.Id;
+                        console.log('cocId = ' + this.cocId);
+                        coc.SummonsStatus = coc.SummonsStatus_c__c;
+                        if (coc.SummonsStatus_c__c == '宸插畬鎴�') {
+                            this.isEditDisabled = true;
+                        }
+                        if (
+                            coc.SummonsStatus_c__c == '鎵瑰噯' ||
+                            coc.SummonsStatus_c__c == '宸查攢鍞緟涓婁紶绾冲搧涔�' ||
+                            coc.SummonsStatus_c__c == '鍑哄簱鍗曞凡鎵撳嵃' ||
+                            coc.SummonsStatus_c__c == '宸插畬鎴�'
+                        ) {
+                            this.isDeliveryDisabled = true;
+                        }
+                        if (
+                            ((coc.Billed_Status__c != '鍏ㄩ儴寮�绁�' &&
+                                coc.SummonsStatus_c__c == '宸插畬鎴�') ||
+                                coc.Onchange_order__c == true) &&
+                            coc.SummonsForDirction__c != '浜掔浉璋冭揣'
+                        ) {
+                            this.isOpenToInvoiceDisabled = false;
+                        }
+                        if (
+                            coc.SummonsStatus_c__c == '宸查攢鍞緟涓婁紶绾冲搧涔�' ||
+                            coc.SummonsStatus_c__c == '鎵瑰噯' ||
+                            coc.SummonsStatus_c__c == '鍑哄簱鍗曞凡鎵撳嵃' ||
+                            coc.SummonsStatus_c__c == '鑽夋涓�'
+                        ) {
+                            this.isPraseToPDFDisabled = false;
+                        }
+                        if (
+                            coc.Billed_Status__c != '杩樻病寮�绁�' ||
+                            coc.SummonsStatus_c__c == '宸插畬鎴�'
+                        ) {
+                            this.isOpenReportDisabled = false;
+                        }
+                        if (
+                            coc.SummonsStatus_c__c == '宸查攢鍞緟涓婁紶绾冲搧涔�' ||
+                            coc.SummonsStatus_c__c == '浠锋牸鏈畾' ||
+                            coc.SummonsStatus_c__c == '鎵瑰噯' ||
+                            coc.SummonsStatus_c__c == '鍑哄簱鍗曞凡鎵撳嵃' ||
+                            coc.SummonsStatus_c__c == '宸插畬鎴�'
+                        ) {
+                            this.isDeleteDisabled = true;
+                        }
+                        this.isConInvoiceShow =
+                            coc.SummonsStatus_c__c == '宸插畬鎴�' &&
+                            coc.SummonsForDirction__c != '浜掔浉璋冭揣'
+                                ? true
+                                : false;
+                        this.summonsStatusPriceNotDetermined =
+                            coc.SummonsStatus_c__c == '浠锋牸鏈畾' ? true : false;
+                        this.isSummonsForDirctionTwoShow =
+                            coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�'
+                                ? true
+                                : false;
+                    }
+                    this.isSearchShow =
+                        !this.Existarrive &&
+                        r.entity.coc.SummonsStatus_c__c != '浠锋牸鏈畾' &&
+                        r.entity.EditAble
+                            ? true
+                            : false;
+                    this.hidecheckboxcolumn = !this.isSearchShow;
+                    this.arriveorder = r.entity.arriveorder;
+                    this.is345Show =
+                        this.arriveorder == '' &&
+                        this.Existarrive == false &&
+                        this.EditAble
+                            ? true
+                            : false;
+                    //濡傛灉涓嶆樉绀�345鍒嗙被锛宑olumns閲岄潰鍒犻櫎3锛�4锛�5鍒嗙被
+                    if (!this.is345Show) {
+                        for (var i = 0; i < this.columns.length; i++) {
+                            if (this.columns[i].label == '绗�3鍒嗙被') {
+                                this.columns.splice(i, 1);
+                            }
+                        }
+                        for (var i = 0; i < this.columns.length; i++) {
+                            if (this.columns[i].label == '绗�4鍒嗙被') {
+                                this.columns.splice(i, 1);
+                            }
+                        }
+                        for (var i = 0; i < this.columns.length; i++) {
+                            if (this.columns[i].label == '绗�5鍒嗙被') {
+                                this.columns.splice(i, 1);
+                            }
+                        }
+                        for (var i = 0; i < this.editColumns.length; i++) {
+                            if (this.editColumns[i].label == '绗�3鍒嗙被') {
+                                this.editColumns.splice(i, 1);
+                            }
+                        }
+                        for (var i = 0; i < this.editColumns.length; i++) {
+                            if (this.editColumns[i].label == '绗�4鍒嗙被') {
+                                this.editColumns.splice(i, 1);
+                            }
+                        }
+                        for (var i = 0; i < this.editColumns.length; i++) {
+                            if (this.editColumns[i].label == '绗�5鍒嗙被') {
+                                this.editColumns.splice(i, 1);
+                            }
+                        }
+                    }
+                    //濡傛灉EditAble==false锛屽垹闄� 鍑鸿揣閲戦(鍏�) 鏈夋晥鏈熷唴搴撳瓨(鐩�) 鏈夋晥鏈熷唴搴撳瓨(涓�) 3鍒� 灞曠ず 杩樻病鍙戠エ鏁伴噺 杩斿搧鏁伴噺 宸插彂绁ㄦ暟閲�
+                    //type : "number",
+                    // typeAttributes:{
+                    //     minimumFractionDigits:2,
+                    // },
+                    if (!this.EditAble) {
+                        let object1 = {
+                            label: this.InvoiceProNotLabel,
+                            fieldName: 'InvoiceProNot_count__c',
+                            type: 'number',
+                            typeAttributes: {
+                                minimumFractionDigits: 2
+                            },
+                            hideDefaultActions: true
+                        };
+                        let object2 = {
+                            label: this.RrturnProLabel,
+                            fieldName: 'RrturnPro_count__c',
+                            hideDefaultActions: true
+                        };
+                        let object3 = {
+                            label: this.InvoicedLabel,
+                            fieldName: 'Invoiced_Procount__c',
+                            type: 'number',
+                            typeAttributes: {
+                                minimumFractionDigits: 2
+                            },
+                            hideDefaultActions: true
+                        };
+                        this.editColumns.push(object1);
+                        this.editColumns.push(object2);
+                        this.editColumns.push(object3);
+                    } else {
+                        this.ForCustomerText =
+                            this.cocLwc.Order_ForCustomerText__c;
+                        console.log(
+                            'EditAble = true this.ForCustomerText = ' +
+                                this.ForCustomerText
+                        );
+                        this.summonsForDirction =
+                            this.cocLwc.SummonsForDirction__c;
+                        console.log(
+                            'EditAble = true this.summonsForDirction = ' +
+                                this.summonsForDirction
+                        );
+                        let value = this.summonsForDirction;
+                        switch (value) {
+                            case '鐩存帴閿�鍞粰鍖婚櫌':
+                                this.isDisabledHospitalName = false;
+                                this.isDisabledForCustomerText = false;
+                                this.secondaryDistributor = '';
+                                this.ForDealerText = '';
+                                this.isDisabledForDealerText = true;
+                                this.isDisabledSecondaryDistributor = true;
+                                break;
+                            case '鍖婚櫌璇曠敤':
+                                this.isDisabledHospitalName = false;
+                                this.isDisabledForCustomerText = false;
+                                this.isDisabledForDealerText = false;
+                                this.isDisabledSecondaryDistributor = false;
+                                break;
+                            case '閿�鍞粰浜岀骇缁忛攢鍟�':
+                                this.isDisabledHospitalName = false;
+                                this.isDisabledForCustomerText = false;
+                                this.isDisabledForDealerText = false;
+                                this.isDisabledSecondaryDistributor = false;
+                                break;
+                            case '浜掔浉璋冭揣':
+                                this.isDisabledHospitalName = true;
+                                this.HospitalName = '';
+                                this.OECId = '';
+                                this.isDisabledForCustomerText = true;
+                                this.ForCustomerText = '';
+                                this.isDisabledForDealerText = false;
+                                this.isDisabledSecondaryDistributor = false;
+                                this.isMutualTransferGoods = true;
+                                break;
+                            default:
+                                this.isDisabledHospitalName = false;
+                                this.isDisabledForCustomerText = false;
+                                this.isDisabledForDealerText = false;
+                                this.isDisabledSecondaryDistributor = false;
+                        }
+                    }
+
+                    //濡傛灉hasHosPro = true 鍖婚櫌鐗逛环
+                    if (this.hasHosPro) {
+                        let object1 = {
+                            label: '鍖婚櫌鐗逛环',
+                            fieldName: 'InvoiceProNot_count__c',
+                            hideDefaultActions: true
+                        };
+                        this.columns.push(object1);
+                        this.editColumns.push(object1);
+                    }
+                    //鍑哄簱鍗曚俊鎭�
+                    this.isSummonsFlag =
+                        r.entity.SummonsFlag == 'visible' ? true : false;
+                    console.log(
+                        'r.entity.provinceOptsMap = ' + r.entity.provinceOptsMap
+                    );
+                    for (var key in r.entity.provinceOptsMap) {
+                        let object = {};
+                        object['label'] = r.entity.provinceOptsMap[key];
+                        object['value'] = key;
+                        this.secondaryDistributorOptions.push(object);
+                    }
+                    for (var key in r.entity.outOutPatternOptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.outOutPatternOptionMap[key];
+                        object['value'] = key;
+                        this.outOutPatternOptionList.push(object);
+                    }
+                    console.log(
+                        'this.secondaryDistributorOptions = ' +
+                            JSON.stringify(this.secondaryDistributorOptions)
+                    );
+                    this.HospitalName = r.entity.HospitalName;
+                    this.sumPrice = r.entity.sumPrice + '鍏�';
+                    this.isShowSpinner = false;
+                    this.showTable = true;
+                    console.log('ESetid = ' + this.ESetid);
+                } else {
+                    console.log('r = ' + JSON.stringify(r));
+                    this.showToast('Error', r.msg);
                 }
-                //鍑哄簱鍗曚俊鎭�
-                this.isSummonsFlag = r.entity.SummonsFlag == "visible" ? true : false;
-                console.log("r.entity.provinceOptsMap = " + r.entity.provinceOptsMap);
-                for (var key in r.entity.provinceOptsMap) {
-                    let object = {};
-                    object["label"] = r.entity.provinceOptsMap[key];
-                    object["value"] = key;
-                    this.secondaryDistributorOptions.push(object);
-                }
-                for (var key in r.entity.outOutPatternOptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.outOutPatternOptionMap[key];
-                    object["value"] = key;
-                    this.outOutPatternOptionList.push(object);
-                }
-                console.log(
-                    "this.secondaryDistributorOptions = " +
-                    JSON.stringify(this.secondaryDistributorOptions)
-                );
-                this.HospitalName = r.entity.HospitalName;
-                this.sumPrice = r.entity.sumPrice + "鍏�";
-                this.isShowSpinner = false;
-                this.showTable = true;
-                console.log("ESetid = " + this.ESetid);
-            } else {
-                console.log("r = " + JSON.stringify(r));
-                this.showToast("Error", r.msg);
-            }
-        });
+            })
+            .catch((error) => {
+                console.log('error = ' + JSON.stringify(error));
+            });
     }
 
     ChangeDirction(event) {
         let value = event.target.value;
         this.summonsForDirction = value;
-        this.cocLwc["SummonsForDirction__c"] = value;
-        console.log("閫夋嫨浜� = " + value);
+        this.cocLwc['SummonsForDirction__c'] = value;
+        console.log('閫夋嫨浜� = ' + value);
         switch (value) {
-            case "鐩存帴閿�鍞粰鍖婚櫌":
+            case '鐩存帴閿�鍞粰鍖婚櫌':
                 this.isDisabledHospitalName = false;
                 this.isDisabledForCustomerText = false;
-                this.secondaryDistributor = "";
-                this.ForDealerText = "";
+                this.secondaryDistributor = '';
+                this.ForDealerText = '';
                 this.isDisabledForDealerText = true;
                 this.isDisabledSecondaryDistributor = true;
+                this.isMutualTransferGoods = false;
                 break;
-            case "鍖婚櫌璇曠敤":
+            case '鍖婚櫌璇曠敤':
                 this.isDisabledHospitalName = false;
                 this.isDisabledForCustomerText = false;
                 this.isDisabledForDealerText = false;
                 this.isDisabledSecondaryDistributor = false;
                 break;
-            case "閿�鍞粰浜岀骇缁忛攢鍟�":
+            case '閿�鍞粰浜岀骇缁忛攢鍟�':
                 this.isDisabledHospitalName = false;
                 this.isDisabledForCustomerText = false;
                 this.isDisabledForDealerText = false;
                 this.isDisabledSecondaryDistributor = false;
                 break;
-            case "浜掔浉璋冭揣":
+            case '浜掔浉璋冭揣':
                 this.isDisabledHospitalName = true;
-                this.HospitalName = "";
-                this.OECId = "";
+                this.HospitalName = '';
+                this.OECId = '';
                 this.isDisabledForCustomerText = true;
-                this.ForCustomerText = "";
+                this.ForCustomerText = '';
                 this.isDisabledForDealerText = false;
                 this.isDisabledSecondaryDistributor = false;
                 this.isMutualTransferGoods = true;
@@ -951,134 +1051,142 @@
     }
 
     dataChange(event) {
-        let fieldName = event.target.getAttribute("data-field");
+        let fieldName = event.target.getAttribute('data-field');
         let value = event.detail.value;
-        console.log("fieldName = " + fieldName + " value = " + value);
+        console.log('fieldName = ' + fieldName + ' value = ' + value);
         switch (fieldName) {
-            case "summonsForDirction":
+            case 'summonsForDirction':
                 this.summonsForDirction = value;
                 break;
-            case "secondaryDistributor":
+            case 'secondaryDistributor':
                 this.secondaryDistributor = value;
                 break;
-            case "HospitalName":
+            case 'HospitalName':
                 this.HospitalName = value;
                 break;
-            case "ForDealerText":
+            case 'ForDealerText':
                 this.ForDealerText = value;
-                this.cocLwc["Order_ForDealerText__c"] = value;
+                this.cocLwc['Order_ForDealerText__c'] = value;
                 break;
-            case "ForCustomerText":
-                this.cocLwc["Order_ForCustomerText__c"] = value;
+            case 'ForCustomerText':
+                this.cocLwc['Order_ForCustomerText__c'] = value;
                 this.ForCustomerText = value;
                 break;
-            case "sumPrice":
+            case 'sumPrice':
                 this.sumPrice = value;
                 break;
-            case "NoConfirmedPrice":
+            case 'NoConfirmedPrice':
                 this.NoConfirmedPrice = !this.NoConfirmedPrice;
-                this.cocLwc["NoConfirmedPrice__c"] = this.NoConfirmedPrice;
-                console.log("this.NoConfirmedPrice = " + this.NoConfirmedPrice);
+                this.cocLwc['NoConfirmedPrice__c'] = this.NoConfirmedPrice;
+                console.log('this.NoConfirmedPrice = ' + this.NoConfirmedPrice);
                 break;
-            case "consumableName":
+            case 'consumableName':
                 this.consumableName = value;
                 break;
-            case "Category3":
+            case 'Category3':
                 this.Category3 = value;
                 //璋冪敤鍚庡彴鏄剧ず绗洓浜斿垎绫�
                 this.showAllCate();
-                if(this.Category3 == ''){
+                if (this.Category3 == '') {
                     this.Category4 = '';
                     this.Category5 = '';
                 }
                 break;
-            case "Category4":
+            case 'Category4':
                 this.Category4 = value;
                 //璋冪敤鍚庡彴鏄剧ず绗簲鍒嗙被
                 this.showCate();
-                if(this.Category4 == ''){
+                if (this.Category4 == '') {
                     this.Category5 = '';
                 }
                 break;
-            case "Category5":
+            case 'Category5':
                 this.Category5 = value;
                 break;
-            case "searchHospitalName":
+            case 'searchHospitalName':
                 this.searchHospitalName = value;
                 break;
-            case "Barcode":
+            case 'Barcode':
                 this.Barcode = value;
                 break;
         }
     }
 
-    showAllCate(){
-        console.log('showAllCate')
+    showAllCate() {
+        console.log('showAllCate');
         categoryAllload({
-            category3Lwc : this.Category3
-        }).then((r) => {
-            r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
-            if (r.status == "Success") {
-                this.category4Options = [];
-                this.category5Options = [];
-                //绗�4鍒嗙被
-                for (var key in r.entity.category4OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category4OptionMap[key];
-                    object["value"] = key;
-                    this.category4Options.push(object);
+            category3Lwc: this.Category3
+        })
+            .then((r) => {
+                r = JSON.parse(JSON.stringify(r));
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    this.category4Options = [];
+                    this.category5Options = [];
+                    //绗�4鍒嗙被
+                    for (var key in r.entity.category4OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category4OptionMap[key];
+                        object['value'] = key;
+                        this.category4Options.push(object);
+                    }
+                    console.log(
+                        'this.category4Options = ' + this.category4Options
+                    );
+                    //绗�5鍒嗙被
+                    for (var key in r.entity.category5OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category5OptionMap[key];
+                        object['value'] = key;
+                        this.category5Options.push(object);
+                    }
+                } else {
+                    console.log('r = ' + JSON.stringify(r));
+                    this.showToast('Error', r.msg);
                 }
-                console.log("this.category4Options = " + this.category4Options);
-                //绗�5鍒嗙被
-                for (var key in r.entity.category5OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category5OptionMap[key];
-                    object["value"] = key;
-                    this.category5Options.push(object);
-                }
-            }else {
-                console.log("r = " + JSON.stringify(r));
-                this.showToast("Error", r.msg);
-            }
-        }).catch((error) => {
-            console.log("error" + JSON.stringify(error));
-        });
+            })
+            .catch((error) => {
+                console.log('error' + JSON.stringify(error));
+            });
     }
 
-    showCate(){
-        console.log('showAllCate')
+    showCate() {
+        console.log('showAllCate');
         categoryload({
-            category3Lwc : this.Category3,
-            category4Lwc : this.Category4
-        }).then((r) => {
-            r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
-            if (r.status == "Success") {
-                this.category4Options = [];
-                this.category5Options = [];
-                //绗�4鍒嗙被
-                for (var key in r.entity.category4OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category4OptionMap[key];
-                    object["value"] = key;
-                    this.category4Options.push(object);
+            category3Lwc: this.Category3,
+            category4Lwc: this.Category4
+        })
+            .then((r) => {
+                r = JSON.parse(JSON.stringify(r));
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    this.category4Options = [];
+                    this.category5Options = [];
+                    //绗�4鍒嗙被
+                    for (var key in r.entity.category4OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category4OptionMap[key];
+                        object['value'] = key;
+                        this.category4Options.push(object);
+                    }
+                    console.log(
+                        'this.category4Options = ' + this.category4Options
+                    );
+                    //绗�5鍒嗙被
+                    for (var key in r.entity.category5OptionMap) {
+                        let object = {};
+                        object['label'] = r.entity.category5OptionMap[key];
+                        object['value'] = key;
+                        this.category5Options.push(object);
+                    }
+                } else {
+                    console.log('r = ' + JSON.stringify(r));
+                    this.showToast('Error', r.msg);
                 }
-                console.log("this.category4Options = " + this.category4Options);
-                //绗�5鍒嗙被
-                for (var key in r.entity.category5OptionMap) {
-                    let object = {};
-                    object["label"] = r.entity.category5OptionMap[key];
-                    object["value"] = key;
-                    this.category5Options.push(object);
-                }
-            }else {
-                console.log("r = " + JSON.stringify(r));
-                this.showToast("Error", r.msg);
-            }
-        }).catch((error) => {
-            console.log("error" + JSON.stringify(error));
-        });
+            })
+            .catch((error) => {
+                console.log('error' + JSON.stringify(error));
+            });
     }
 
     invoiceChange(event) {
@@ -1092,7 +1200,7 @@
         const event = new ShowToastEvent({
             title: type,
             variant: type,
-            message: msg,
+            message: msg
         });
         this.dispatchEvent(event);
     }
@@ -1100,14 +1208,29 @@
     searchProductJs() {
         this.isShowSpinner = true;
         //this.showTable = false;
+        //鏌ヨ鏈夊摢浜涢�夋嫨浜嗙殑鐒跺悗check
+        const selectedRows = this.template
+            .querySelector('c-lex-custom-lightning-datatable')
+            .getSelectedRows();
+        console.log('selectedRows = ' + selectedRows);
+        for (var i in this.data) {
+            this.data[i]['check'] = false;
+        }
+        for (var i in this.data) {
+            for (var j in selectedRows) {
+                if (this.data[i].Id == selectedRows[j].Id) {
+                    this.data[i]['check'] = true;
+                }
+            }
+        }
 
         let cloneData = this.data;
         for (var i in cloneData) {
-            cloneData[i]["Name"] = cloneData[i].Name__c;
-            cloneData[i]["Category3"] = cloneData[i].Category3__c;
-            cloneData[i]["Category4"] = cloneData[i].Category4__c;
-            cloneData[i]["Category5"] = cloneData[i].Category5__c;
-            cloneData[i]["BoxPiece"] = cloneData[i].Box_Piece__c;
+            cloneData[i]['Name'] = cloneData[i].Name__c;
+            cloneData[i]['Category3'] = cloneData[i].Category3__c;
+            cloneData[i]['Category4'] = cloneData[i].Category4__c;
+            cloneData[i]['Category5'] = cloneData[i].Category5__c;
+            cloneData[i]['BoxPiece'] = cloneData[i].Box_Piece__c;
             delete cloneData[i].Name__c;
             delete cloneData[i].Category3__c;
             delete cloneData[i].Category4__c;
@@ -1115,7 +1238,7 @@
             delete cloneData[i].Box_Piece__c;
         }
 
-        console.log("cloneData = " + JSON.stringify(cloneData));
+        console.log('cloneData = ' + JSON.stringify(cloneData));
         searchConsumableorderdetails({
             agencyProTypeLwc: this.agencyProType,
             accountNameLwc: this.accountName,
@@ -1127,12 +1250,13 @@
             category5: this.Category5,
             editAbleLwc: this.EditAble,
             pageRecordsLwcLwc: cloneData,
-            consumableproductdetailsRecordsLwc: this.consumableproductdetailsRecords,
-            arriveorderLwc: this.arriveorder,
+            consumableproductdetailsRecordsLwc:
+                this.consumableproductdetailsRecords,
+            arriveorderLwc: this.arriveorder
         }).then((r) => {
             r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
-            if (r.status == "Success") {
+            console.log('r = ' + JSON.stringify(r));
+            if (r.status == 'Success') {
                 let tempData = [];
                 //this.data = r.entity.pageRecords;
                 tempData = r.entity.pageRecords;
@@ -1140,99 +1264,172 @@
                     let unitOptions = [];
                     for (var key in tempData[i].boxorpieceMap) {
                         let unitOption = {};
-                        unitOption["label"] = tempData[i].boxorpieceMap[key];
-                        unitOption["value"] = key;
+                        unitOption['label'] = tempData[i].boxorpieceMap[key];
+                        unitOption['value'] = key;
                         unitOptions.push(unitOption);
                     }
-                    tempData[i]["unitOptions"] = unitOptions;
-                    tempData[i]["unitValue"] = unitOptions[0].value;
-                    tempData[i]["recordId"] = tempData[i].Prod.Id;
-                    tempData[i]["Id"] = tempData[i].Prod.Id;
-                    tempData[i]["Name__c"] = tempData[i].Prod.Name__c;
-                    tempData[i]["SFDA_Status__c"] = tempData[i].Prod.SFDA_Status__c;
-                    tempData[i]["Category3__c"] = tempData[i].Prod.Category3__c;
-                    tempData[i]["Category4__c"] = tempData[i].Prod.Category4__c;
-                    tempData[i]["Category5__c"] = tempData[i].Prod.Category5__c;
-                    tempData[i]["Box_Piece__c"] = tempData[i].orderdetails1.Box_Piece__c;
-                    tempData[i]["shipmentNumber"] = tempData[i].orderdetails1.Shipment_Count__c;
-                    tempData[i]["shippingUnitPrice"] = tempData[i].orderdetails1.Delivery_List_RMB__c;
-                    console.log(
-                        "shippingUnitPrice = " + tempData[i]["shippingUnitPrice"]
-                    );
-                    if (tempData[i]["shippingUnitPrice"] && tempData[i]["shipmentNumber"])
-                        tempData[i]["shipmentAmount"] = this.amend(
-                            tempData[i]["shipmentNumber"],
-                            tempData[i]["shippingUnitPrice"],
-                            "*"
-                        );
+                    tempData[i]['unitOptions'] = unitOptions;
+                    tempData[i]['unitValue'] =
+                        tempData[i]['unitValue'] == null
+                            ? unitOptions[0].value
+                            : tempData[i]['unitValue'];
+                    if (this.EditAble) {
+                        tempData[i].orderdetails1['Box_Piece__c'] =
+                            tempData[i].orderdetails1['Box_Piece__c'] == null
+                                ? unitOptions[0].value
+                                : tempData[i].orderdetails1['Box_Piece__c'];
+                        tempData[i].orderdetails1['Shipment_Count__c'] =
+                            tempData[i].orderdetails1['Shipment_Count__c'] ==
+                            null
+                                ? 0
+                                : tempData[i].orderdetails1[
+                                      'Shipment_Count__c'
+                                  ];
+                        tempData[i].orderdetails1['Delivery_List_RMB__c'] =
+                            tempData[i].orderdetails1['Delivery_List_RMB__c'] ==
+                            null
+                                ? 0.0
+                                : tempData[i].orderdetails1[
+                                      'Delivery_List_RMB__c'
+                                  ];
+                    } else {
+                        tempData[i]['InvoiceProNot_count__c'] =
+                            tempData[i].orderdetails1.InvoiceProNot_count__c;
+                        tempData[i]['RrturnPro_count__c'] =
+                            tempData[i].orderdetails1.RrturnPro_count__c;
+                        tempData[i]['Invoiced_Procount__c'] =
+                            tempData[i].orderdetails1.Invoiced_Procount__c;
+                    }
+                    tempData[i]['shipmentNumber'] =
+                        tempData[i].orderdetails1['Shipment_Count__c'];
+                    tempData[i]['shippingUnitPrice'] =
+                        tempData[i].orderdetails1['Delivery_List_RMB__c'];
+
+                    tempData[i]['recordId'] = tempData[i].Prod.Id;
+                    tempData[i]['Id'] = tempData[i].Prod.Id;
+                    tempData[i]['Name__c'] = tempData[i].Prod.Name__c;
+                    tempData[i]['SFDA_Status__c'] =
+                        tempData[i].Prod.SFDA_Status__c;
+                    tempData[i]['Category3__c'] = tempData[i].Prod.Category3__c;
+                    tempData[i]['Category4__c'] = tempData[i].Prod.Category4__c;
+                    tempData[i]['Category5__c'] = tempData[i].Prod.Category5__c;
+                    tempData[i]['Box_Piece__c'] =
+                        tempData[i].orderdetails1.Box_Piece__c;
+                    tempData[i]['shipmentAmount'] =
+                        tempData[i].orderdetails1.Shipment_amount__c;
+                    tempData[i]['Shipment_amount__c'] =
+                        tempData[i].orderdetails1.Shipment_amount__c;
+                    tempData[i]['Shipment_Count__c'] =
+                        tempData[i].orderdetails1.Shipment_Count__c;
+
+                    if (tempData[i]['check']) {
+                        this.selectedRows.push(tempData[i].Id);
+                    }
                 }
+                // for (var i in tempData) {
+                //     let unitOptions = [];
+                //     for (var key in tempData[i].boxorpieceMap) {
+                //         let unitOption = {};
+                //         unitOption["label"] = tempData[i].boxorpieceMap[key];
+                //         unitOption["value"] = key;
+                //         unitOptions.push(unitOption);
+                //     }
+                //     tempData[i]["unitOptions"] = unitOptions;
+                //     tempData[i]["unitValue"] = unitOptions[0].value;
+                //     tempData[i]["recordId"] = tempData[i].Prod.Id;
+                //     tempData[i]["Id"] = tempData[i].Prod.Id;
+                //     tempData[i]["Name__c"] = tempData[i].Prod.Name__c;
+                //     tempData[i]["SFDA_Status__c"] = tempData[i].Prod.SFDA_Status__c;
+                //     tempData[i]["Category3__c"] = tempData[i].Prod.Category3__c;
+                //     tempData[i]["Category4__c"] = tempData[i].Prod.Category4__c;
+                //     tempData[i]["Category5__c"] = tempData[i].Prod.Category5__c;
+                //     tempData[i]["Box_Piece__c"] = tempData[i].orderdetails1.Box_Piece__c;
+                //     tempData[i]["shipmentNumber"] = tempData[i].orderdetails1.Shipment_Count__c;
+                //     tempData[i]["shippingUnitPrice"] = tempData[i].orderdetails1.Delivery_List_RMB__c;
+                //     console.log(
+                //         "shippingUnitPrice = " + tempData[i]["shippingUnitPrice"]
+                //     );
+                //     if (tempData[i]["shippingUnitPrice"] && tempData[i]["shipmentNumber"])
+                //         tempData[i]["shipmentAmount"] = this.amend(
+                //             tempData[i]["shipmentNumber"],
+                //             tempData[i]["shippingUnitPrice"],
+                //             "*"
+                //         );
+                // }
                 this.data = tempData;
-                console.log("this.data = " + JSON.stringify(this.data));
+                console.log('this.data = ' + JSON.stringify(this.data));
                 //this.showTable = true;
                 this.isShowSpinner = false;
-            }else {
-                console.log("r = " + JSON.stringify(r));
-                this.showToast("Error", r.msg);
+            } else {
+                console.log('r = ' + JSON.stringify(r));
+                this.showToast('Error', r.msg);
             }
         });
     }
 
     searchHospitalNameModal() {
-        console.log("searchHospitalNameModal");
+        console.log('searchHospitalNameModal');
         hospitalInit({
-            ctype: this.agencyProType,
+            ctype: this.agencyProType
         }).then((r) => {
             r = JSON.parse(JSON.stringify(r));
-            if (r.status == "Success") {
+            if (r.status == 'Success') {
                 this.hospitalList = r.entity.at;
                 for (var i in this.hospitalList) {
-                    this.hospitalList[i]["stateMasterName"] =
+                    this.hospitalList[i]['stateMasterName'] =
                         this.hospitalList[i].State_Master__r.Name;
                 }
-                console.log("hospitalInit r = " + JSON.stringify(this.hospitalList));
+                console.log(
+                    'hospitalInit r = ' + JSON.stringify(this.hospitalList)
+                );
                 this.isModalOpen = true;
             }
         });
     }
 
     searchHospital() {
-        console.log("this.searchHospitalName = " + this.searchHospitalName);
+        console.log('this.searchHospitalName = ' + this.searchHospitalName);
         serContact({
             searchName: this.searchHospitalName,
-            ctype: this.agencyProType,
+            ctype: this.agencyProType
         }).then((r) => {
             r = JSON.parse(JSON.stringify(r));
-            if (r.status == "Success") {
+            if (r.status == 'Success') {
                 this.hospitalList = r.entity.at;
                 for (var i in this.hospitalList) {
-                    this.hospitalList[i]["stateMasterName"] =
+                    this.hospitalList[i]['stateMasterName'] =
                         this.hospitalList[i].State_Master__r.Name;
                 }
-                console.log("hospitalInit r = " + JSON.stringify(this.hospitalList));
+                console.log(
+                    'hospitalInit r = ' + JSON.stringify(this.hospitalList)
+                );
             }
         });
     }
 
     searchHandleRowAction(event) {
-        console.log("searchHandleRowAction");
+        console.log('searchHandleRowAction');
         let row = event.detail.row;
         this.OECId = row.Id;
         this.HospitalName = row.Name;
         console.log(
-            "this.OECId = " + this.OECId + " this.HospitalName = " + this.HospitalName
+            'this.OECId = ' +
+                this.OECId +
+                ' this.HospitalName = ' +
+                this.HospitalName
         );
         this.isModalOpen = false;
-        console.log("this.isModalOpen = " + this.isModalOpen);
+        console.log('this.isModalOpen = ' + this.isModalOpen);
     }
 
     clearAgencyI(event) {
         this.HospitalName = event.target.value;
-        if (this.HospitalName == "" || this.HospitalName == null) {
-            this.OECId = "";
+        if (this.HospitalName == '' || this.HospitalName == null) {
+            this.OECId = '';
         }
-        console.log("this.HospitalName = " + this.HospitalName);
-        console.log("this.OECId = " + this.OECId);
-        if (this.OECId != null && this.OECId != "") {
+        console.log('this.HospitalName = ' + this.HospitalName);
+        console.log('this.OECId = ' + this.OECId);
+        if (this.OECId != null && this.OECId != '') {
             this.checkOutPattern();
         }
     }
@@ -1249,9 +1446,9 @@
             }
         }
         if (ishos > 0) {
-            this.cocLwc["OutPattern__c"] = true;
+            this.cocLwc['OutPattern__c'] = true;
         } else {
-            this.cocLwc["OutPattern__c"] = false;
+            this.cocLwc['OutPattern__c'] = false;
         }
     }
 
@@ -1260,32 +1457,32 @@
     }
 
     handleUnitChange(event) {
-        console.log("handleUnitChange");
+        console.log('handleUnitChange');
         const unitDetail = event.detail;
-        console.log("unitDetail = " + JSON.stringify(unitDetail));
+        console.log('unitDetail = ' + JSON.stringify(unitDetail));
         for (var i in this.data) {
             if (this.data[i].recordId == unitDetail.data.recordId) {
                 this.data[i].unitValue = unitDetail.data.unitValue;
-                this.data[i].orderdetails1["Box_Piece__c"] = unitDetail.data.unitValue;
+                this.data[i].orderdetails1['Box_Piece__c'] =
+                    unitDetail.data.unitValue;
             }
         }
-        console.log("this.data = " + JSON.stringify(this.data));
+        console.log('this.data = ' + JSON.stringify(this.data));
     }
 
     handleShipmentNumber(event) {
-        console.log("handleShipmentNumber");
+        console.log('handleShipmentNumber');
         const numberDetail = event.detail;
-        console.log("numberDetail = " + JSON.stringify(numberDetail));
+        console.log('numberDetail = ' + JSON.stringify(numberDetail));
         let index = 0;
         for (var i in this.data) {
             if (this.data[i].recordId == numberDetail.data.recordId) {
                 index = i;
-                this.data[i].shipmentNumber = Number(numberDetail.data.shipmentnumber);
-                this.data[i].orderdetails1["Shipment_Count__c"] = Number(
+                this.data[i].shipmentNumber = Number(
                     numberDetail.data.shipmentnumber
                 );
-                console.log(
-                    "this.data[i].shipmentNumber = " + this.data[i].shipmentNumber
+                this.data[i].orderdetails1['Shipment_Count__c'] = Number(
+                    numberDetail.data.shipmentnumber
                 );
             }
         }
@@ -1297,7 +1494,7 @@
     }
 
     handleShipmentUnitPrice(event) {
-        console.log("handleShipmentUnitPrice");
+        console.log('handleShipmentUnitPrice');
         const priceDetail = event.detail;
         let index = 0;
         for (var i in this.data) {
@@ -1306,11 +1503,8 @@
                 this.data[i].shippingUnitPrice = Number(
                     priceDetail.data.shipmentunitprice
                 );
-                this.data[i].orderdetails1["Delivery_List_RMB__c"] = Number(
+                this.data[i].orderdetails1['Delivery_List_RMB__c'] = Number(
                     priceDetail.data.shipmentunitprice
-                );
-                console.log(
-                    "this.data[i].shippingUnitPrice = " + this.data[i].shippingUnitPrice
                 );
             }
         }
@@ -1322,27 +1516,31 @@
     }
 
     ComputePrice(index, number, price) {
-        console.log("index = " + index);
-        console.log("number = " + number);
-        console.log("price = " + price);
-        let shipmentAmount = this.amend(number, price, "*");
-        console.log("shipmentAmount = " + shipmentAmount);
+        console.log('index = ' + index);
+        console.log('number = ' + number);
+        console.log('price = ' + price);
+        let shipmentAmount = this.amend(number, price, '*');
+        console.log('shipmentAmount = ' + shipmentAmount);
         let sumPrice = 0.0;
         this.data[index].shipmentAmount = shipmentAmount;
         for (var i in this.data) {
-            if (this.data[i].shipmentAmount) sumPrice += this.data[i].shipmentAmount;
+            if (this.data[i].shipmentAmount)
+                sumPrice += this.data[i].shipmentAmount;
         }
-        this.sumPrice = sumPrice + "鍏�";
+        this.sumPrice = sumPrice + '鍏�';
         //瀛樹笅閫夋嫨琛岋紝涓嶄細琚竻绌�
-        this.selectedRows = [];
-        for (var i in this.data) {
-            if (this.data[i].check) {
-                this.selectedRows.push(this.data[i].Id);
-            }
-        }
+        if (this.selectedRows.indexOf(this.data[index].Id) == -1)
+            this.selectedRows.push(this.data[index].Id);
+        // this.selectedRows = [];
+        // for (var i in this.data) {
+        //     if (this.data[i].check) {
+        //         this.selectedRows.push(this.data[i].Id);
+        //     }
+        // }
         this.data = [...this.data];
-        console.log("this.selectedRows = " + JSON.stringify(this.selectedRows));
-        console.log("this.data = " + JSON.stringify(this.data));
+        this.selectedRows = [...this.selectedRows];
+        console.log('this.selectedRows = ' + JSON.stringify(this.selectedRows));
+        console.log('this.data = ' + JSON.stringify(this.data));
     }
 
     //num1 num2浼犲叆涓や釜鍊�  symbol +-*/绗﹀彿
@@ -1354,12 +1552,12 @@
             str2Length;
         //瑙e喅鏁存暟娌℃湁灏忔暟鐐规柟娉�
         try {
-            str1Length = str1.split(".")[1].length;
+            str1Length = str1.split('.')[1].length;
         } catch (error) {
             str1Length = 0;
         }
         try {
-            str2Length = str2.split(".")[1].length;
+            str2Length = str2.split('.')[1].length;
         } catch (error) {
             str2Length = 0;
         }
@@ -1367,16 +1565,16 @@
         //
         console.log(step);
         switch (symbol) {
-            case "+":
+            case '+':
                 result = (num1 * step + num2 * step) / step;
                 break;
-            case "-":
+            case '-':
                 result = (num1 * step - num2 * step) / step;
                 break;
-            case "*":
+            case '*':
                 result = (num1 * step * (num2 * step)) / step / step;
                 break;
-            case "/":
+            case '/':
                 result = (num1 * step) / (num2 * step);
                 break;
             default:
@@ -1386,23 +1584,23 @@
     }
 
     getSelectedRows(event) {
-        const selectedRows = event.detail.selectedRows;
-        console.log("this.selectedRows = " + this.selectedRows);
-        for (var i in this.data) {
-            this.data[i]["check"] = false;
-        }
-        for (var i in this.data) {
-            for (var j in selectedRows) {
-                if (this.data[i].Id == selectedRows[j].Id) {
-                    this.data[i]["check"] = true;
-                }
-            }
-        }
+        // const selectedRows = event.detail.selectedRows;
+        // console.log("this.selectedRows = " + this.selectedRows);
+        // for (var i in this.data) {
+        //     this.data[i]["check"] = false;
+        // }
+        // for (var i in this.data) {
+        //     for (var j in selectedRows) {
+        //         if (this.data[i].Id == selectedRows[j].Id) {
+        //             this.data[i]["check"] = true;
+        //         }
+        //     }
+        // }
     }
 
     saveConfirmJs() {
-        let msg = "鍑哄簱浠锋牸浠呭彲鎿嶄綔涓�娆″彉鏇达紝淇濆瓨鍚庡皢鏃犳硶淇敼銆俓n\n璇风‘璁わ紒";
-        if (this.SummonsStatus == "浠锋牸鏈畾") {
+        let msg = '鍑哄簱浠锋牸浠呭彲鎿嶄綔涓�娆″彉鏇达紝淇濆瓨鍚庡皢鏃犳硶淇敼銆俓n\n璇风‘璁わ紒';
+        if (this.SummonsStatus == '浠锋牸鏈畾') {
             if (confirm(msg) == true) {
                 this.saveConfirm();
             }
@@ -1413,110 +1611,130 @@
 
     saveConfirm() {
         this.isShowSpinner = true;
+
+        //鏌ヨ鏈夊摢浜涢�夋嫨浜嗙殑鐒跺悗check
+        const selectedRows = this.template
+            .querySelector('c-lex-custom-lightning-datatable')
+            .getSelectedRows();
+        console.log('selectedRows = ' + selectedRows);
+        for (var i in this.data) {
+            this.data[i]['check'] = false;
+        }
+        for (var i in this.data) {
+            for (var j in selectedRows) {
+                if (this.data[i].Id == selectedRows[j].Id) {
+                    this.data[i]['check'] = true;
+                }
+            }
+        }
+
         let cloneData = this.data;
         for (var i in cloneData) {
-            cloneData[i]["Name"] = cloneData[i].Name__c;
-            cloneData[i]["Category3"] = cloneData[i].Category3__c;
-            cloneData[i]["Category4"] = cloneData[i].Category4__c;
-            cloneData[i]["Category5"] = cloneData[i].Category5__c;
-            cloneData[i]["BoxPiece"] = cloneData[i].Box_Piece__c;
+            cloneData[i]['Name'] = cloneData[i].Name__c;
+            cloneData[i]['Category3'] = cloneData[i].Category3__c;
+            cloneData[i]['Category4'] = cloneData[i].Category4__c;
+            cloneData[i]['Category5'] = cloneData[i].Category5__c;
+            cloneData[i]['BoxPiece'] = cloneData[i].Box_Piece__c;
             delete cloneData[i].Name__c;
             delete cloneData[i].Category3__c;
             delete cloneData[i].Category4__c;
             delete cloneData[i].Category5__c;
             delete cloneData[i].Box_Piece__c;
         }
-        console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
-        console.log("this.OECId = " + this.OECId);
-        console.log("this.HospitalName = " + this.HospitalName);
-        console.log("this.secondaryDistributor = " + this.secondaryDistributor);
-        console.log("this.pageRecordsLwc = " + JSON.stringify(cloneData));
-        console.log("this.accountid = " + this.accountid);
-        console.log("this.ESetid = " + this.ESetid);
+        console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
+        console.log('this.OECId = ' + this.OECId);
+        console.log('this.HospitalName = ' + this.HospitalName);
+        console.log('this.secondaryDistributor = ' + this.secondaryDistributor);
+        console.log('this.pageRecordsLwc = ' + JSON.stringify(cloneData));
+        console.log('this.accountid = ' + this.accountid);
+        console.log('this.ESetid = ' + this.ESetid);
         console.log(
-            "this.consumableproductdetailsRecords = " +
-            JSON.stringify(this.consumableproductdetailsRecords)
+            'this.consumableproductdetailsRecords = ' +
+                JSON.stringify(this.consumableproductdetailsRecords)
         );
         save({
             cocLwc: this.cocLwc,
             hospitalInfoLwc: this.OECId,
             hospitalNameLwc: this.HospitalName,
-            secondaryDistributor: this.secondaryDistributor,
+            secondaryDistributorLwc: this.secondaryDistributor,
             pageRecordsLwc: cloneData,
-            accountid: this.accountid,
-            ESetId: this.ESetid,
-            consumableproductdetailsRecordsLwc: this.consumableproductdetailsRecords,
+            accountidLwc: this.accountid,
+            ESetIdLwc: this.ESetid,
+            consumableproductdetailsRecordsLwc:
+                this.consumableproductdetailsRecords,
+            agencyProTypeLwc: this.agencyProType,
+            userWorkLocationLwc: this.userWorkLocation
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-
-                if (r.status == "Success") {
-                    let url = "/lexsummonscreat?ESetid=" + r.entity.ESetId;
+                console.log('r = ' + JSON.stringify(r));
+                debugger;
+                if (r.status == 'Success') {
+                    let url = '/lexsummonscreat?ESetid=' + r.entity.ESetId;
                     this[NavigationMixin.Navigate]({
-                        type: "standard__webPage",
+                        type: 'standard__webPage',
                         attributes: {
-                            url: url,
-                        },
+                            url: url
+                        }
                     });
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
             })
             .catch((error) => {
-                console.log("error = " + JSON.stringify(error));
+                console.log('error = ' + JSON.stringify(error));
             });
     }
 
     //鎵撳嵃鎸囩ず鍗�
     PraseToPDFJs() {
-        console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
-        console.log("this.ESetId = " + this.ESetid);
+        console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
+        console.log('this.ESetId = ' + this.ESetid);
         PraseToPDF({
             cocLwc: this.cocLwc,
-            ESetId: this.ESetid,
+            ESetId: this.ESetid
         }).then((r) => {
             r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
-            if (r.status == "Success") {
-                window.open("/customer/summonsPDF?ESetid=" + r.entity.ESetId);
+            console.log('r = ' + JSON.stringify(r));
+            if (r.status == 'Success') {
+                window.open('/customer/summonsPDF?ESetid=' + r.entity.ESetId);
             } else {
-                console.log("r.msg = " + r.msg);
-                this.showToast("Error", r.msg);
+                console.log('r.msg = ' + r.msg);
+                this.showToast('Error', r.msg);
             }
         });
     }
 
     //鏄剧ず鏄庣粏
     openReportJs() {
-        console.log("openReportJs");
+        console.log('openReportJs');
         var reportId = this.ESetid;
         reportId = reportId.substring(0, 15);
-        let url = "/report/00O100000058VzB?fv1=" + reportId;
-        console.log("url = " + url);
+        let url = '/report/00O100000058VzB?fv1=' + reportId;
+        console.log('url = ' + url);
         this[NavigationMixin.Navigate]({
-            type: "standard__webPage",
+            type: 'standard__webPage',
             attributes: {
-                url: url,
-            },
+                url: url
+            }
         });
     }
 
     vpClear2Delay(event) {
-        console.log("vpClear2Delay");
-        if (this.summonsForDirction != "浜掔浉璋冭揣") {
-            this.cocLwc["Order_ForDealerText__c"] = event.target.value;
-            console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
+        console.log('vpClear2Delay');
+        if (this.summonsForDirction != '浜掔浉璋冭揣') {
+            this.cocLwc['Order_ForDealerText__c'] = event.target.value;
+            console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
         } else {
             //console.log('Order_ForDealerTextID__c = ' + this.cocLwc['Order_ForDealerTextID__c'])
-            this.cocLwc["Order_ForDealerText__c"] =
-                this.cocLwc["Order_ForDealerTextID__c"] == "" ||
-                    this.cocLwc["Order_ForDealerTextID__c"] == null ||
-                    this.cocLwc["Order_ForDealerTextID__c"] == undefined
-                    ? ""
-                    : this.cocLwc["Order_ForDealerText__c"];
-            console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
+            this.cocLwc['Order_ForDealerText__c'] =
+                this.cocLwc['Order_ForDealerTextID__c'] == '' ||
+                this.cocLwc['Order_ForDealerTextID__c'] == null ||
+                this.cocLwc['Order_ForDealerTextID__c'] == undefined
+                    ? ''
+                    : this.cocLwc['Order_ForDealerText__c'];
+            console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
             // console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
             // this.ForDealerText = this.cocLwc['Order_ForDealerText__c'];
             // event.target.value = this.cocLwc['Order_ForDealerText__c'];
@@ -1525,28 +1743,28 @@
     }
     handleSearch(event) {
         const lookupElement = event.target;
-        console.log("event.detail = " + JSON.stringify(event.detail));
+        console.log('event.detail = ' + JSON.stringify(event.detail));
         apexSearch({
-            searchTerm: event.detail.searchTerm,
+            searchTerm: event.detail.searchTerm
         })
             .then((results) => {
                 lookupElement.setSearchResults(results);
             })
             .catch((error) => {
-                console.log("error" + JSON.stringify(error));
+                console.log('error' + JSON.stringify(error));
             });
     }
 
     handleSelectionChange(event) {
         const selection = event.target.getSelection();
-        console.log("selection = " + JSON.stringify(selection));
-        this.cocLwc["Order_ForDealerTextID__c"] = selection[0].id;
-        this.cocLwc["Order_ForDealerText__c"] = selection[0].title;
-        console.log("this.cocLwc = " + JSON.stringify(this.cocLwc));
+        console.log('selection = ' + JSON.stringify(selection));
+        this.cocLwc['Order_ForDealerTextID__c'] = selection[0].id;
+        this.cocLwc['Order_ForDealerText__c'] = selection[0].title;
+        console.log('this.cocLwc = ' + JSON.stringify(this.cocLwc));
     }
 
     handleFilesChange(event) {
-        console.log("handleFilesChange");
+        console.log('handleFilesChange');
         if (event.target.files.length > 0) {
             this.filesUploaded = event.target.files;
             this.fileName = event.target.files[0].name;
@@ -1554,149 +1772,175 @@
     }
 
     handleSave() {
-        console.log("saveFile");
+        console.log('saveFile');
         if (this.filesUploaded.length > 0) {
             this.file = this.filesUploaded[0];
             if (this.file.size > this.MAX_FILE_SIZE) {
-                this.showToast("Error", "鏂囦欢杩囧ぇ");
+                this.showToast('Error', '鏂囦欢杩囧ぇ');
                 return;
             }
-            this.showLoadingSpinner = true;
+            this.showPopSpinner = true;
             this.fileReader = new FileReader();
 
             this.fileReader.onloadend = () => {
                 this.fileContents = this.fileReader.result;
-                let base64 = "base64,";
-                this.content = this.fileContents.indexOf(base64) + base64.length;
+                let base64 = 'base64,';
+                this.content =
+                    this.fileContents.indexOf(base64) + base64.length;
                 this.fileContents = this.fileContents.substring(this.content);
                 this.saveToFile();
             };
             this.fileReader.readAsDataURL(this.file);
         } else {
-            this.fileName = "閫夋嫨涓�涓枃浠朵笂浼�";
+            this.fileName = '閫夋嫨涓�涓枃浠朵笂浼�';
         }
     }
 
     saveToFile() {
-        console.log("saveToFile");
-        console.log("base64Data = " + encodeURIComponent(this.fileContents));
+        console.log('saveToFile');
+        console.log('base64Data = ' + encodeURIComponent(this.fileContents));
         saveFile({
             recordId: this.ESetid,
             fileName: this.fileName,
-            base64Data: encodeURIComponent(this.fileContents),
+            base64Data: encodeURIComponent(this.fileContents)
         })
             .then((r) => {
+                this.showPopSpinner = false;
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                this.showLoadingSpinner = false;
-                this.showToast("Success", "涓婁紶鎴愬姛");
+                console.log('r = ' + JSON.stringify(r));
+                this.closePop();
+                this.showToast('Success', '涓婁紶鎴愬姛');
                 this.getFiles();
             })
             .catch((error) => {
-                console.log("error = " + error.message);
-                this.showToast("Error", "涓婁紶澶辫触");
+                this.showPopSpinner = false;
+                console.log('error = ' + error.message);
+                this.showToast('Error', '涓婁紶澶辫触');
             });
     }
 
     getFiles() {
-        console.log("getFiles");
+        console.log('getFiles');
         this.showLoadingSpinner = true;
         getFiles({
-            recordId: this.ESetid,
+            recordId: this.ESetid
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
+                console.log('r = ' + JSON.stringify(r));
                 this.fileData = r.entity.cvList;
                 for (var i in this.fileData) {
-                    this.fileData[i]["CreatedByName"] = this.fileData[i].CreatedBy.Name;
-                    this.fileData[i]["url"] = "/" + this.fileData[i].Id;
+                    this.fileData[i]['CreatedByName'] =
+                        this.fileData[i].CreatedBy.Name;
+                    this.fileData[i]['url'] = '/' + this.fileData[i].Id;
                 }
-                console.log("this.fileData = " + this.fileData);
+                console.log('this.fileData = ' + this.fileData);
                 this.showLoadingSpinner = false;
             })
             .catch((error) => {
-                console.log("error = " + error.message);
-                this.showToast("Error", "鑾峰彇闄勪欢澶辫触");
+                console.log('error = ' + error.message);
+                this.showToast('Error', '鑾峰彇闄勪欢澶辫触');
             });
     }
 
     GoodsDeliveryJs() {
         this.isShowSpinner = true;
+
+        //鏌ヨ鏈夊摢浜涢�夋嫨浜嗙殑鐒跺悗check
+        const selectedRows = this.template
+            .querySelector('c-lex-custom-lightning-datatable')
+            .getSelectedRows();
+        console.log('selectedRows = ' + selectedRows);
+        for (var i in this.data) {
+            this.data[i]['check'] = false;
+        }
+        for (var i in this.data) {
+            for (var j in selectedRows) {
+                if (this.data[i].Id == selectedRows[j].Id) {
+                    this.data[i]['check'] = true;
+                }
+            }
+        }
+
         let cloneData = this.data;
         for (var i in cloneData) {
-            cloneData[i]["Name"] = cloneData[i].Name__c;
-            cloneData[i]["Category3"] = cloneData[i].Category3__c;
-            cloneData[i]["Category4"] = cloneData[i].Category4__c;
-            cloneData[i]["Category5"] = cloneData[i].Category5__c;
-            cloneData[i]["BoxPiece"] = cloneData[i].Box_Piece__c;
+            cloneData[i]['Name'] = cloneData[i].Name__c;
+            cloneData[i]['Category3'] = cloneData[i].Category3__c;
+            cloneData[i]['Category4'] = cloneData[i].Category4__c;
+            cloneData[i]['Category5'] = cloneData[i].Category5__c;
+            cloneData[i]['BoxPiece'] = cloneData[i].Box_Piece__c;
             delete cloneData[i].Name__c;
             delete cloneData[i].Category3__c;
             delete cloneData[i].Category4__c;
             delete cloneData[i].Category5__c;
             delete cloneData[i].Box_Piece__c;
         }
-        console.log("cloneData = " + JSON.stringify(cloneData));
+        console.log('cloneData = ' + JSON.stringify(cloneData));
         GoodsDelivery({
             cocLwc: this.cocLwc,
             ESetId: this.ESetid,
-            pageRecordsLwcLwc: cloneData,
+            pageRecordsLwcLwc: cloneData
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                if (r.status == "Success") {
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
                     console.log(
-                        "Summons_Order_type__c = " + this.cocLwc["Summons_Order_type__c"]
+                        'Summons_Order_type__c = ' +
+                            this.cocLwc['Summons_Order_type__c']
                     );
                     this.isSales =
-                        this.cocLwc["Summons_Order_type__c"] == "閿�鍞�" ? true : false;
+                        this.cocLwc['Summons_Order_type__c'] == '閿�鍞�'
+                            ? true
+                            : false;
                     this.GoodsDeliveryInit();
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
                 this.isShippingSales = true;
             })
             .catch((error) => {
-                console.log("error = " + error.message);
-                this.showToast("Error", "璺宠浆澶辫触");
+                console.log('error = ' + error.message);
+                this.showToast('Error', '璺宠浆澶辫触');
             });
     }
 
     GoodsDeliveryInit() {
-        console.log("GoodsDeliveryInit");
+        console.log('GoodsDeliveryInit');
         GoodsDeliveryInit({
-            ESetId: this.ESetid,
+            ESetId: this.ESetid
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                if (r.status == "Success") {
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
                     this.salesCoc = r.entity.coc;
                     this.salesAccountName = r.entity.accountName;
                     this.salesUserWorkLocation = r.entity.userWorkLocation;
                     this.salesAccountid = r.entity.accountid;
                     this.salesOrderdetails = r.entity.orderdetails;
                     this.salesData = r.entity.consumableorderdetailsRecords;
-                    this.salesErrorData = r.entity.consumableorderdetailsRecordserror;
+                    this.salesErrorData =
+                        r.entity.consumableorderdetailsRecordserror;
                     this.salesOrderpieceorboxMap = r.entity.orderpieceorboxMap;
                     this.salesOrderpriceMap = r.entity.orderpriceMap;
-                    this.salesOrderagencypriceMap = r.entity.orderagencypriceMap;
+                    this.salesOrderagencypriceMap =
+                        r.entity.orderagencypriceMap;
                     this.isShowSpinner = false;
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
             })
             .catch((error) => {
-                console.log("error = " + error.message);
-                this.showToast("Error", "鍒濆鍖栧け璐�");
+                console.log('error = ' + error.message);
+                this.showToast('Error', '鍒濆鍖栧け璐�');
             });
     }
 
     SalesearchProductJs() {
-        console.log("this.Barcode = " + this.Barcode);
+        console.log('this.Barcode = ' + this.Barcode);
         this.isShowSpinner = true;
         SearchPro({
             cocLwc: this.salesCoc,
@@ -1705,55 +1949,65 @@
             userWorkLocation: this.salesUserWorkLocation,
             accountid: this.salesAccountid,
             orderdetails: this.salesOrderdetails,
-            orderpieceorboxMap: this.salesOrderpieceorboxMap,
+            orderpieceorboxMap: this.salesOrderpieceorboxMap
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                if (r.status == "Success") {
-                    console.log("SearchPro success");
-                    this.salesErrorData = r.entity.consumableorderdetailsRecordserror;
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    console.log('SearchPro success');
+                    this.salesErrorData =
+                        r.entity.consumableorderdetailsRecordserror;
                     this.salesData = r.entity.consumableorderdetailsRecords;
                     for (var i in this.salesErrorData) {
-                        this.salesErrorData[i]["Consumable_order_minor__c"] =
-                            this.salesErrorData[i].orderdetails2.Consumable_order_minor__c;
-                        this.salesErrorData[i]["orderdetails2Name"] =
+                        this.salesErrorData[i]['Consumable_order_minor__c'] =
+                            this.salesErrorData[
+                                i
+                            ].orderdetails2.Consumable_order_minor__c;
+                        this.salesErrorData[i]['orderdetails2Name'] =
                             this.salesErrorData[i].orderdetails2.Name;
-                        this.salesErrorData[i]["ProdName"] =
+                        this.salesErrorData[i]['ProdName'] =
                             this.salesErrorData[i].Prod.Name;
-                        this.salesErrorData[i]["Box_Piece__c"] =
+                        this.salesErrorData[i]['Box_Piece__c'] =
                             this.salesErrorData[i].orderdetails2.Box_Piece__c;
-                        this.salesErrorData[i]["Bar_Code__c"] =
+                        this.salesErrorData[i]['Bar_Code__c'] =
                             this.salesErrorData[i].orderdetails2.Bar_Code__c;
-                        this.salesErrorData[i]["Sterilization_limit__c"] =
-                            this.salesErrorData[i].orderdetails2.Sterilization_limit__c;
+                        this.salesErrorData[i]['Sterilization_limit__c'] =
+                            this.salesErrorData[
+                                i
+                            ].orderdetails2.Sterilization_limit__c;
                     }
                     for (var i in this.salesData) {
-                        this.salesData[i]["Consumable_order_minor__c"] =
-                            this.salesData[i].orderdetails2.Consumable_order_minor__c;
-                        this.salesData[i]["orderdetails2Name"] =
+                        this.salesData[i]['Consumable_order_minor__c'] =
+                            this.salesData[
+                                i
+                            ].orderdetails2.Consumable_order_minor__c;
+                        this.salesData[i]['orderdetails2Name'] =
                             this.salesData[i].orderdetails2.Name;
-                        this.salesData[i]["orderdetails2NameUrl"] =
-                            "/" + this.salesData[i].orderdetails2.Id;
-                        this.salesData[i]["Box_Piece__c"] =
+                        this.salesData[i]['orderdetails2NameUrl'] =
+                            '/' + this.salesData[i].orderdetails2.Id;
+                        this.salesData[i]['Box_Piece__c'] =
                             this.salesData[i].orderdetails2.Box_Piece__c;
-                        this.salesData[i]["ProdName"] = this.salesData[i].Prod.Name;
-                        this.salesData[i]["Deliver_date__c"] =
+                        this.salesData[i]['ProdName'] =
+                            this.salesData[i].Prod.Name;
+                        this.salesData[i]['Deliver_date__c'] =
                             this.salesData[i].orderdetails2.Deliver_date__c;
-                        this.salesData[i]["Bar_Code__c"] =
+                        this.salesData[i]['Bar_Code__c'] =
                             this.salesData[i].orderdetails2.Bar_Code__c;
-                        this.salesData[i]["Sterilization_limit__c"] =
-                            this.salesData[i].orderdetails2.Sterilization_limit__c;
+                        this.salesData[i]['Sterilization_limit__c'] =
+                            this.salesData[
+                                i
+                            ].orderdetails2.Sterilization_limit__c;
                     }
                     this.isShowSpinner = false;
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
             })
             .catch((error) => {
-                console.log("error = " + JSON.stringify(error.message));
-                this.showToast("Error", "鍒濆鍖栧け璐�");
+                console.log('error = ' + JSON.stringify(error.message));
+                this.showToast('Error', '鍒濆鍖栧け璐�');
             });
     }
 
@@ -1768,7 +2022,7 @@
             delete cloneSalesData[i].Deliver_date__c;
             delete cloneSalesData[i].Bar_Code__c;
             delete cloneSalesData[i].Sterilization_limit__c;
-            cloneSalesData[i]["ErrorReason"] = "";
+            cloneSalesData[i]['ErrorReason'] = '';
         }
         this.isShowSpinner = true;
         ProSale({
@@ -1780,28 +2034,28 @@
             consumableorderdetailsRecordsLwc: JSON.stringify(cloneSalesData),
             orderdetails: this.salesOrderdetails,
             orderpriceMap: this.salesOrderpriceMap,
-            orderagencypriceMap: this.salesOrderagencypriceMap,
+            orderagencypriceMap: this.salesOrderagencypriceMap
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                if (r.status == "Success") {
-                    console.log("ProdElivery success");
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    console.log('ProdElivery success');
                     this.isShowSpinner = false;
                     this[NavigationMixin.Navigate]({
-                        type: "standard__webPage",
+                        type: 'standard__webPage',
                         attributes: {
-                            url: "/lexsaleanddelivery",
-                        },
+                            url: '/lexsaleanddelivery'
+                        }
                     });
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
             })
             .catch((error) => {
-                console.log("error = " + JSON.stringify(error.message));
-                this.showToast("Error", "ProSale2澶辫触");
+                console.log('error = ' + JSON.stringify(error.message));
+                this.showToast('Error', 'ProSale2澶辫触');
             });
     }
 
@@ -1816,7 +2070,7 @@
             delete cloneSalesData[i].Deliver_date__c;
             delete cloneSalesData[i].Bar_Code__c;
             delete cloneSalesData[i].Sterilization_limit__c;
-            cloneSalesData[i]["ErrorReason"] = "";
+            cloneSalesData[i]['ErrorReason'] = '';
         }
         this.isShowSpinner = true;
         ProdElivery({
@@ -1828,28 +2082,28 @@
             consumableorderdetailsRecordsLwc: JSON.stringify(cloneSalesData),
             orderdetails: this.salesOrderdetails,
             orderpriceMap: this.salesOrderpriceMap,
-            orderagencypriceMap: this.salesOrderagencypriceMap,
+            orderagencypriceMap: this.salesOrderagencypriceMap
         })
             .then((r) => {
                 r = JSON.parse(JSON.stringify(r));
-                console.log("r = " + JSON.stringify(r));
-                if (r.status == "Success") {
-                    console.log("ProdElivery success");
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    console.log('ProdElivery success');
                     this.isShowSpinner = false;
                     this[NavigationMixin.Navigate]({
-                        type: "standard__webPage",
+                        type: 'standard__webPage',
                         attributes: {
-                            url: "/lexsaleanddelivery",
-                        },
+                            url: '/lexsaleanddelivery'
+                        }
                     });
                 } else {
-                    console.log("r.msg = " + r.msg);
-                    this.showToast("Error", r.msg);
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
                 }
             })
             .catch((error) => {
-                console.log("error = " + JSON.stringify(error.message));
-                this.showToast("Error", "鍒濆鍖栧け璐�");
+                console.log('error = ' + JSON.stringify(error.message));
+                this.showToast('Error', '鍒濆鍖栧け璐�');
             });
     }
 
@@ -1858,15 +2112,23 @@
         let url = '';
         console.log('this.invoiceId = ' + this.invoiceId);
         if (this.invoiceId.length > 0 && this.invoiceId != '000000000000000') {
-            url = "/lexconinvoiceview?deliveryId=" + this.ESetid + "&invoiceId=" + this.invoiceId + "&KeyWords=Redirect";
+            url =
+                '/lexconinvoiceview?deliveryId=' +
+                this.ESetid +
+                '&invoiceId=' +
+                this.invoiceId +
+                '&KeyWords=Redirect';
         } else {
-            url = "/lexconinvoiceview?deliveryId=" + this.ESetid + "&KeyWords=Redirect";
+            url =
+                '/lexconinvoiceview?deliveryId=' +
+                this.ESetid +
+                '&KeyWords=Redirect';
         }
         this[NavigationMixin.Navigate]({
-            type: "standard__webPage",
+            type: 'standard__webPage',
             attributes: {
-                url: url,
-            },
+                url: url
+            }
         });
     }
 
@@ -1874,36 +2136,113 @@
     DeleteConsumable() {
         this.isShowSpinner = true;
         DelConsumable({
-            ESetId: this.ESetid,
-        }).then((r) => {
-            r = JSON.parse(JSON.stringify(r));
-            console.log("r = " + JSON.stringify(r));
-            if (r.status == "Success") {
-                let url = "/lexsaleanddelivery";
-                this[NavigationMixin.Navigate]({
-                    type: "standard__webPage",
-                    attributes: {
-                        url: url,
-                    },
-                });
-            } else {
-                console.log("r.msg = " + r.msg);
-                this.showToast("Error", r.msg);
+            ESetId: this.ESetid
+        })
+            .then((r) => {
+                r = JSON.parse(JSON.stringify(r));
+                console.log('r = ' + JSON.stringify(r));
+                if (r.status == 'Success') {
+                    let url = '/lexsaleanddelivery';
+                    this[NavigationMixin.Navigate]({
+                        type: 'standard__webPage',
+                        attributes: {
+                            url: url
+                        }
+                    });
+                } else {
+                    console.log('r.msg = ' + r.msg);
+                    this.showToast('Error', r.msg);
+                }
+            })
+            .catch((error) => {
+                console.log('error = ' + error.message);
+                this.showToast('Error', '璺宠浆澶辫触');
+            });
+    }
+
+    handleLoad() {
+        console.log('handleLoad');
+        try {
+            const style = document.createElement('style');
+            style.innerText = '.slds-button__icon {display: none;}';
+            this.template.querySelector('.hideHelpText').appendChild(style);
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    handleLoad2() {
+        console.log('handleLoad2');
+        try {
+            const style = document.createElement('style');
+            style.innerText = '.slds-button__icon {display: none;}';
+            this.template.querySelector('.hideHelpText').appendChild(style);
+
+            const style2 = document.createElement('style');
+            style2.innerText =
+                '.hehe-layoutItem  .slds-form-element__label {padding : 0px}';
+            this.template.querySelector('.hideHelpText').appendChild(style2);
+        } catch (error) {
+            console.log(error);
+        }
+    }
+    //缂栬緫鍑哄簱鍗�
+    EditConsumable() {
+        let url =
+            '/lexsummonscreat?ESetid=' + this.ESetid + '&KeyWords=Redirect';
+        this[NavigationMixin.Navigate]({
+            type: 'standard__webPage',
+            attributes: {
+                url: url
             }
-        }).catch((error) => {
-            console.log("error = " + error.message);
-            this.showToast("Error", "璺宠浆澶辫触");
         });
     }
 
-    //缂栬緫鍑哄簱鍗�
-    EditConsumable() {
-        let url = "/lexsummonscreat?ESetid=" + this.ESetid + "&KeyWords=Redirect";
-        this[NavigationMixin.Navigate]({
-            type: "standard__webPage",
-            attributes: {
-                url: url,
-            },
-        });
+    //鏄剧ず涓婁紶闄勪欢
+    uploadOrder(event) {
+        this.showAttPop = true;
     }
-}
\ No newline at end of file
+
+    //闄勪欢change浜嬩欢
+    attChange(event) {
+        if (event.target.files.length > 0) {
+            this.filesUploaded = event.target.files;
+            this.fileName = event.target.files[0].name;
+            console.log('this.fileName:' + this.fileName);
+        }
+    }
+
+    //鏄惁鏄剧ず闄勪欢绉婚櫎
+    get attDelBtn() {
+        if (
+            this.fileName != '' &&
+            this.fileName != null &&
+            this.fileName != '璇烽�夋嫨涓�涓枃浠朵笂浼�'
+        ) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //鍏抽棴闄勪欢寮圭獥
+    closePop() {
+        this.showAttPop = false;
+        this.filesUploaded = [];
+        this.fileName = null;
+    }
+
+    //绉婚櫎闄勪欢
+    removeAtt() {
+        this.filesUploaded = [];
+        this.fileName = '';
+    }
+
+    ClearJs() {
+        this.consumableName = '';
+        this.Category3 = '';
+        this.Category4 = '';
+        this.Category5 = '';
+        this.searchProductJs();
+    }
+}
diff --git a/manifest/packageForSign.xml b/manifest/packageForSign.xml
index f63f744..26fd0a3 100644
--- a/manifest/packageForSign.xml
+++ b/manifest/packageForSign.xml
@@ -3,8 +3,11 @@
     <types>
         <members>updateESignBatch</members>
         <members>DNUpsertBatch</members>
-        <members>SyncProvinceWIndowToSignForm</members>
         <members>OCSMHandler</members>
+        <members>updateESignBatchTest</members>
+        <members>OCSMHandlerTest</members>
+        <members>DNUpsertBatchTest</members>
+        <members>SyncProvinceWIndowToSignForm</members>
         <name>ApexClass</name>
     </types>
     <version>52.0</version>

--
Gitblit v1.9.1