修复生产汇报单，生产入库单

llj

2026-02-28 62180eee1845f0ac95cf8106e7b771d0248faf92

修复生产汇报单，生产入库单

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -36,7 +36,7 @@
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">复制</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>-->
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">删除</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">打印</button>
                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
@@ -740,6 +740,8 @@
                    success: function (result) {
                        if (result.count == 1) {
                            HIsCheck = true;
                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);

                            layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
@@ -1240,6 +1242,26 @@
                            $("#HMainSourceEntryID").val(data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID);
                            $("#HExplanation").val("");
                            $("#HRemark").val(data.表头备注);
                            $("#HMaker").val(data.制单人 || "");
                            $("#HMakeDate").val(data.制单日期 ? formatDate(data.制单日期) : "");
                            $("#HChecker").val(data.审核人 || "");
                            $("#HCheckDate").val(data.审核日期 ? formatDate(data.审核日期) : "");
                            $("#HUpDater").val(data.修改人 || "");
                            $("#HUpDateDate").val(data.修改日期 ? formatDate(data.修改日期) : "");
                            $("#HCloseMan").val(data.关闭人 || "");
                            $("#HCloseDate").val(data.关闭日期 ? formatDate(data.关闭日期) : "");
                            $("#HDeleteMan").val(data.作废人 || "");
                            $("#HDeleteDate").val(data.作废日期 ? formatDate(data.作废日期) : "");
                            if (data.审核人 && data.审核人.trim() !== "") {
                                
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#get_PrintReport').removeClass("layui-btn-disabled").attr("disabled", false);
                                HIsCheck = true; 
                            } else {
                                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
                                $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
                                HIsCheck = false;
                            }
                            PicUpload();
                            get_file();
                        } else {

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBillEdit.html

@@ -807,10 +807,10 @@
                if (OperationType == 1 || OperationType == 4) {

                      if ($("#HSourceBillType").val() == "3710") {
                        for (var i = 0; i < option.data.length; i++) {
                          for (var i = 0; i < option.data.length; i++) {
                              var tableData = table.cache["mainTable"];
                            var HSourceBillData = "";
                            var HSourceBillData = getPushSource_ICMOBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //获取源单数据
                            if (HSourceBillData != "none") {
                              var HSourceBillData = getPushSource_ICMOBillInit(tableData[i].HSourceInterID, tableData[i].HSourceEntryID);                            if (HSourceBillData != "none") {
                                if (HSourceBillData == null) {
                                    layer.alert("保存失败!第" + (i + 1) + "行：未查询到源单单据!", { icon: 5 });
                                    return;
@@ -1091,7 +1091,7 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            //ReRoadBillMain();
                        }
@@ -1517,7 +1517,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?Type=' +"Warehouse", 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1534,12 +1534,12 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "收料仓库": OptionData.仓库名称
                                })
                            }
                            // , end: function () {
                            //    obj.update({
                            //        "HWHID": OptionData.HItemID
                            //        , "收料仓库": OptionData.仓库名称
                            //    })
                            //}
                            })
                        }
                        //辅助计量单位
@@ -1857,7 +1857,14 @@
            $("#HKeeperName").val(obj[0].职员名称);
            $("#HKeeperID").val(obj[0].HItemID);
        }
        
        function GetGyCur(obj)  //返回币别
        {
            $("#HCurName").val(obj.货币名称);
            $("#HCurID").val(obj.HItemID);
            $("#HExRate").val(obj.汇率);

        }
        function GetHWHValue(obj)  //返回仓库
        {
            $("#HWHName").val(obj[0].仓库名称);
@@ -1880,8 +1887,9 @@
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
        function GetGyWarehouse(data) {
            option.data = data
             //OptionData = data
         } 
        //双击返回辅助属性
         function GetGyProperty(data) {