Merge branch 'master' into yyk

yyk

2024-07-18 bf1a9a818ffb721aea2709e9409fbb932b07e81d

 HTML/views/SOSetting/ExportNotice.html

@@ -324,6 +324,21 @@
                     }}
                     {{ GetBtn9(d) }}
                  </script>

               <script type="text/html" id="templetIsMixBox">
                  {{# function GetBtn10(d){
                        switch (d.IsMixBox) {
                           case "0":
                              return "否"; 
                           case "1":
                              return "是"; 
                           default:
                              return ""; 
                        }
                     }	
                  }}
                  {{ GetBtn10(d) }}
               </script>
               <!-- #endregion -->
            </div>

@@ -770,6 +785,7 @@
            { field: 'CompleteQty', title: '拣货数量', align: 'center', width: 100 },
            { field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 },
            { field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 },
            { field: 'IsMixBox', title: '是否拼箱', align: 'center', templet: '#templetIsMixBox', width: 90 },
            { field: 'LotText', title: '批次描述', align: 'center', width: 100 },
            { field: 'PackagName', title: '包装名称', align: 'center', width: 120 },
            { field: 'SupplierLot', title: '供货批次', align: 'center', width: 120 },
@@ -1181,31 +1197,37 @@
                              isChongFu = true;
                           });
                        } else { //不成功

                           layer.confirm('当前单据批次出库是跨批出库，是否跨批出库？', function () {
                              var param1 = {
                                 soNo: SoNo,
                                 tab: "1"
                              };
                              sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
                                 if (res.code == 0) { //成功
                                    layer.msg("操作成功！", {
                                       icon: 1,
                                       time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    }, function () {
                                       refreshTable();
                                       isChongFu = true;
                                    });
                                 } else {
                                    layer.msg(res.msg, {
                                       icon: 2,
                                       time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    }, function () {
                                       isChongFu = true;
                                    });
                                 }
                           if(res.code==2){
                              layer.confirm('当前单据批次出库是跨批出库，是否跨批出库？', function () {
                                 var param1 = {
                                    soNo: SoNo,
                                    tab: "1"
                                 };
                                 sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
                                    if (res.code == 0) { //成功
                                       layer.msg("操作成功！", {
                                          icon: 1,
                                          time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                       }, function () {
                                          refreshTable();
                                          isChongFu = true;
                                       });
                                    } else {
                                       layer.msg(res.msg, {
                                          icon: 2,
                                          time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                       }, function () {
                                          isChongFu = true;
                                       });
                                    }
                                 })
                              })
                           })
                           }else{
                              layer.msg(res.msg, {
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                           }									
                           isChongFu = true;
                        }
                     });