Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 HTML/views/ASNSetting/BoxInfo.html

@@ -754,8 +754,8 @@
                           BoxNo2: data[0].Sheet1[i].BoxNo2,
                           BoxNo3: data[0].Sheet1[i].BoxNo3,
                           Qty: Qty,
                           SkuNo: data[0].Sheet1[i].SkuNo,
                           LotNo: data[0].Sheet1[i].LotNo,
                           SkuNo: data[0].Sheet1[i].SkuNo.toString(),
                           LotNo: data[0].Sheet1[i].LotNo.toString(),
                           LotText: data[0].Sheet1[i].LotText,
                           ProductionTime: data[0].Sheet1[i].ProductionTime,
                           InspectMark: InspectMark,
@@ -772,6 +772,7 @@
                     console.log(param)
                     layer.load();//打开loading
                     sendData(IP + "/BllAsn/ImportBllBoxInfo", param, 'post', function (res) {
                        console.log(res);
                        layer.closeAll(); //关闭loading
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {