nothing

zzr99

2022-05-20 c674882ab752ac038bea83e09aaa156a067a1947

nothing

 WebTM/Vlog/webapi20220517.txt

New file
@@ -0,0 +1 @@
2022/5/17 13:44:42 æ‰“印sql:select fo.FBILLNO é”€å”®è®¢å•å·,fo.F_ZZZZ_TEXT7 è”系人,fo.FRECEIVEADDRESS æ”¶è´§æ–¹åœ°å€,fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HBarCode ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID where  a.HItemID in ('30983')

 WebTM/Vlog/webapi20220518.txt

New file
@@ -0,0 +1 @@
2022/5/18 10:46:56 æ‰“印sql:select fo.FBILLNO é”€å”®è®¢å•å·,fo.F_ZZZZ_TEXT7 è”系人,fo.FRECEIVEADDRESS æ”¶è´§æ–¹åœ°å€,fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HBarCode ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 from Gy_BarCodeBill a left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID where  a.HItemID in ('6932','6932')

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -60,10 +60,7 @@
        var Type = params[params[1]];
        var OpenTmp = params[params[2]];

        if (OpenTmp =="墙咔条码") {
            Type += "1";
        }

        
        switch (Type) {
           
            //case "HBarCodePrint"://物料条码打印

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_QK_PackingBillList.aspx

@@ -27,18 +27,18 @@

            if (type.Trim()=="墙咔条码")
            {
                SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo è®¢å•å·,a.HMaterID,m.HName ç‰©æ–™,m.HModel åž‹å·,a.HQty æ•°é‡,a.HBatchNo æ‰¹å·,a.HBarCode ç®±å·,a.HRemark åœºæ™¯å· from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
                SqlXMLReportData.GenOneRecordset(this, "select HSourceBillNo è®¢å•å·,a.HMaterID,m.HName ç‰©æ–™,m.HModel åž‹å·,a.HQty æ•°é‡,a.HBatchNo æ‰¹å·,a.HRemark ç®±å·,a.HRemark åœºæ™¯å· from Gy_BarCodeBill a left join Gy_Material m on a.HMaterID=m.HItemID where a.HItemID in (" + PrintIds + ")");
            }
            else
            {
                 SqlXMLReportData.GenOneRecordset(this, "select fo.FBILLNO é”€å”®è®¢å•å·,fo.F_ZZZZ_TEXT7 è”系人,fo.FRECEIVEADDRESS æ”¶è´§æ–¹åœ°å€," +
                "fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HBarCode ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 " +
                "fm1.FOLDNUMBER é”€å”®ç‰©æ–™åç§°,fo.F_ZZZZ_TEXT åŒ…装方式,fu.FDATAVALUE èŠ±åž‹,fu1.FDATAVALUE å¢™å’”缝,a.HQty æ•°é‡,a.HRemark ç®±å·,fo.F_ZZZZ_WBBZ å¤–包备注 " +
                "from Gy_BarCodeBill a " +
                "left join Sc_ICMOBillSub b on a.HSourceInterID=b.HInterID " +
                " left join Sc_ICMOBillSub b on a.HSourceEntryID=b.HEntryID and a.HSourceInterID = b.HInterID " +
                "left join AIS20200908101915zs..T_PRD_MOENTRY f1 on b.HERPEntryID=f1.FENTRYID " +
                "left join AIS20200908101915zs..T_SAL_ORDER fo on f1.FSaleOrderId =fo.FID " +
                "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on fo.FID=fo1.FID " +
                "left join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
                "left join AIS20200908101915zs..T_SAL_ORDERENTRY fo1 on f1.FSaleOrderEntryId=fo1.FENTRYID " +
                "left join AIS20200908101915zs..T_SAL_ORDER fo on fo1.FID=fo.FID " +
                "LEFT join AIS20200908101915zs..T_BD_MATERIAL fm1 on fo1.FSUBMATERIALNUMBER=fm1.FMATERIALID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu1 on fo1.F_ZZZZ_ASSISTANT1=fu1.FENTRYID " +
                "LEFT JOIN AIS20200908101915zs..T_BAS_ASSISTANTDATAENTRY_L fu on fo1.F_ZZZZ_ASSISTANT2=fu.FENTRYID "+
               "where  a.HItemID in (" + PrintIds + ")");

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_Add_MESBeginStepWorkBillList.html

@@ -110,7 +110,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                           

                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -234,6 +234,28 @@
                                                            <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">销售订单号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="F_YQN_XSDD" lay-verify="F_YQN_XSDD" id="F_YQN_XSDD" disabled autocomplete="off">

                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">销售物料名称:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="F_zzzz_Text4" lay-verify="F_zzzz_Text4" id="F_zzzz_Text4" disabled autocomplete="off">

                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">销售数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="FQTY" lay-verify="FQTY" id="FQTY" disabled autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
@@ -447,6 +469,7 @@
                $("#HMainSourceInterID").val("");
                $("#HMainSourceEntryID").val("");
                $("#HMainSourceBillNo").val("");
                $('#HMainSourceBillNo').attr("readonly", true);
                $("#HMainSourceBillType").val("");
                $('#HMainSourceBillNo').attr("disabled", false);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
@@ -487,6 +510,9 @@
                                        , "HICMOInterID": "0"
                                        , "HICMOEntryID": "0"
                                        , "HICMOBillNo": "0"
                                        , "F_YQN_XSDD": data.销售订单编号
                                        , "F_zzzz_Text4": data.销售物料名称
                                        , "FQTY": data.销售数量
                                    });
                                    $("#HMainSourceBillNo").css("box-shadow", "none");
                                    $("#HProcID").val(0);
@@ -1059,6 +1085,7 @@
                return Result = false;
            }
            if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                $("#HGroupID").val(0);
                layer.msg("班组不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú×°Ïäµ¥/QK_PackedBillList.html

@@ -314,7 +314,6 @@
                    layer.msg('请选择至少一行数据打印！');
                }
            }

            //打印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
@@ -347,11 +346,11 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var cache=table.cache['mainTable1']
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 0) {
                    var HInterID = data[0].hmainid.toString();
                    if (cache.length!=0) {
                        flag = 1;
                    }
                    //if (cache.length!=0) {
                    //    flag = 1;
                    //}
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú×°Ïäµ¥/QK_PackingBill.html

@@ -109,16 +109,14 @@
            });
            //整箱生成
            form.on('submit(btnPack)', function (data) {
                var flag = "ZZ";
                var sSubStr = table.checkStatus('mainTable');
                if (sSubStr.data.length > 0) {
                    SavePack(flag, sSubStr);
                    SavePack(sSubStr);
                }
                else {
                    layer.msg('请最少选择1行数据！');
                    return;
                }
                SavePack(flag, sSubStr);
            });
            //拼箱生成
            form.on('submit(btnAssembly)', function (data) {
@@ -177,6 +175,7 @@
                    , { field: 'HMinQty', title: '最小包装数', edit: 'text', event: 'HMinQty', width: 100 }
                    , { field: 'HTotalQty', title: '生成条数', edit: 'false', width: 100 }
                    , { field: 'HSpsQty', title: '剩余数量', edit: 'false', width: 100 }
                    , { field: 'HXH', title: '箱号', edit: 'false', width: 100 }

                    , { field: 'FBillNo', title: '销售订单号', edit: 'false', width: 100 }
                    , { field: 'FLXName', title: '联系人', edit: 'text',  width: 100 }
@@ -213,7 +212,7 @@
                table.render(option);
            }
            //生成
            function SavePack(flag, sSubStr) {
            function SavePack(sSubStr) {
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
@@ -223,7 +222,7 @@
                        type: "POST",
                        url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //方法所在页面和方法名
                        async: true,
                        data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + flag + ";" + sessionStorage["OrganizationID"]},
                        data: { "msg": JSON.stringify(sSubStr.data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"]},
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -237,8 +236,8 @@
                                else {
                                    OpenTmp = "包装方式条码";
                                }
                                window.open("../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                              
                                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

                            }
                            else {
                                f_alert(data.Message);
@@ -262,6 +261,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,最小包装数不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr.data[i].HXH == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,箱号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
                }
                else {