MES-WEB-LayUI.git

parent: dbef02da | 补丁 | 提交 | ignore whitespace

2021-12-21 25a0440aa1f5940efbd818b7edfd0e54d6617dfd

雅琪诺开班单、完工单列表、产量汇报列表调用参数及加工序修改

5个文件已修改

	WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html	100 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_Add_ProductReportStepBillList.html

@@ -145,6 +145,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
                                                            <input id="HProcID" name="HProcID" type="hidden" />
                                                            <input id="HProcNumber" name="HProcNumber" type="hidden" />
                                                        </div>
                                                    </div>
                                                </div>
@@ -152,7 +153,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">äº§åä»£ç </label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -194,6 +195,7 @@
                                                        <label class="layui-form-label">çäº§çç»:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HGroupNumber" id="HGroupNumber" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -205,8 +207,9 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">æä½å:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HWorkManName" id="HWorkManName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWorkManID" id="HWorkManID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HEmpNumber" id="HEmpNumber" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -215,16 +218,21 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">ä¸è¯æ°é:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBadQty" lay-verify="HBadQty" id="HBadQty" autocomplete="off">
                                                            <input class="layui-input" name="HBadCount" lay-verify="HBadCount" id="HBadCount" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">æ¥åºæ°é:</label>
                                                        <label class="layui-form-label">å å·¥æ¥åºæ°:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
                                                        </div>
                                                    </div>

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">å ææ¥åºæ°:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
@@ -238,13 +246,13 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">å¼å·¥æ¶é´:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                            <input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">æ¥å·¥æ¶é´:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                            <input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                </div>
@@ -396,11 +404,11 @@
            function set_InitFrom() {
                //æ¥ææ¶é´éæ©å¨
                laydate.render({
                    elem: '#HWorkBeginDate'
                    elem: '#HRelBeginDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HWorkReportDate'
                    elem: '#HRelEndDate'
                    , type: 'datetime'
                });
                laydate.render({
@@ -434,7 +442,7 @@
            {
                //åå§åºæ¬ä¿¡æ¯èµå¼
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //åæ®æ¥æ
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //æ¥å·¥æ¥æ
                $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //æ¥å·¥æ¥æ
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //å¶åæ¥æ
                $("#HMaker").val(sessionStorage["HUserName"]);     //å¶åäºº
            }
@@ -444,7 +452,7 @@
                refSav = "Add";
                //åå§åºæ¬ä¿¡æ¯èµå¼
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //åæ®æ¥æ
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //æ¥å·¥æ¥æ
                $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //æ¥å·¥æ¥æ
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //å¶åæ¥æ
                $("#HMaker").val(sessionStorage["HUserName"]);     //å¶åäºº

@@ -453,15 +461,15 @@
                $('#HSourceBillNo').attr("disabled", true);
                $('#HProcExchBillNo').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterNumber').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HPlanQty').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HWorkBeginDate').attr("disabled", true);
                $('#HWorkReportDate').attr("disabled", true);
                $('#HRelBeginDate').attr("disabled", true);
                $('#HRelEndDate').attr("disabled", true);

                $.ajax(
                    {
@@ -480,9 +488,10 @@
                            {
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                $("#HProcID").val(LoadData[0].HProcID); //å½åå·¥åºID
                                $("#HProcNumber").val(LoadData[0].HProcNumber); //å½åå·¥åºç¼ç 
                                $("#HProcName").val(LoadData[0].HProcName); //å½åå·¥åº
                                $("#HMaterID").val(LoadData[0].HMaterID); //äº§åID
                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //äº§åä»£ç 
                                $("#HMaterNumber").val(LoadData[0].HMaterNumber); //äº§åä»£ç 
                                $("#HMaterName").val(LoadData[0].HMaterName); //äº§ååç§°
                                $("#HMaterSpec").val(LoadData[0].HModel); //äº§åè§æ ¼
                                $("#HSourceID").val(LoadData[0].HSourceID); //çäº§èµæºID
@@ -492,11 +501,12 @@
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
                                $("#HSourceBillType").val(HSourceBillType); //æºåç±»å
                                $("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
                                $("#HGroupNumber").val(LoadData[0].HDeptNumber); //çç»ç¼ç 
                                $("#HGroupName").val(LoadData[0].HDeptName); //çç»
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
                                $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //å¼å·¥æ¶é´
                                $("#HRelBeginDate").val(LoadData[0].HBeginDate); //å¼å·¥æ¶é´
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //è®¡åæ°é

                            }
@@ -520,15 +530,15 @@
                $('#HSourceBillNo').attr("disabled", true);
                $('#HProcExchBillNo').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterNumber').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HPlanQty').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HWorkBeginDate').attr("disabled", true);
                $('#HWorkReportDate').attr("disabled", true);
                $('#HRelBeginDate').attr("disabled", true);
                $('#HRelEndDate').attr("disabled", true);
               
                $.ajax(
                    {
@@ -548,10 +558,11 @@
                                $("#HInterID").val(LoadData[0].HInterID); //åæ®ID
                                $("#HBillNo").val(LoadData[0].åæ®å·); //åæ®å·
                                $("#HDate").val(formatDate(LoadData[0].æ¥æ)); //æ¥æ
                                $("#HProcID").val(""); //å½åå·¥åºID
                                $("#HProcName").val(""); //å½åå·¥åº
                                $("#HProcID").val(LoadData[0].HProcID); //å½åå·¥åºID
                                $("#HProcNumber").val(LoadData[0].HProcNumber); //å½åå·¥åºç¼ç 
                                $("#HProcName").val(LoadData[0].HProcName); //å½åå·¥åº
                                $("#HMaterID").val(LoadData[0].HMaterID); //äº§åID
                                $("#HMaterCode").val(LoadData[0].äº§åä»£ç ); //äº§åä»£ç 
                                $("#HMaterNumber").val(LoadData[0].äº§åä»£ç ); //äº§åä»£ç 
                                $("#HMaterName").val(LoadData[0].äº§ååç§°); //äº§ååç§°
                                $("#HMaterSpec").val(LoadData[0].äº§åè§æ ¼); //äº§åè§æ ¼
                                $("#HSourceID").val(LoadData[0].HSourceID); //çäº§èµæºID
@@ -561,18 +572,21 @@
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
                                $("#HSourceBillType").val(LoadData[0].æºåç±»å); //æºåç±»å
                                $("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
                                $("#HGroupNumber").val(LoadData[0].çäº§çç»ä»£ç ); //çç»ç¼ç 
                                $("#HGroupName").val(LoadData[0].çäº§çç»); //çç»
                                $("#HWorkManID").val(LoadData[0].HWorkManID); //æä½åID
                                $("#HWorkManName").val(LoadData[0].æä½å); //æä½å
                                $("#HEmpID").val(LoadData[0].HWorkManID); //æä½åID
                                $("#HEmpNumber").val(LoadData[0].æä½åç¼ç ); //æä½åç¼ç 
                                $("#HEmpName").val(LoadData[0].æä½å); //æä½å
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
                                $("#HWorkBeginDate").val(formatDate(LoadData[0].å¼å·¥æ¶é´)); //å¼å·¥æ¶é´
                                $("#HWorkReportDate").val(formatDate(LoadData[0].æ¥å·¥æ¶é´)); //æ¥å·¥æ¶é´
                                $("#HRelBeginDate").val(formatDate(LoadData[0].å¼å·¥æ¶é´)); //å¼å·¥æ¶é´
                                $("#HRelEndDate").val(formatDate(LoadData[0].æ¥å·¥æ¶é´)); //æ¥å·¥æ¶é´
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //è®¡åæ°é
                                $("#HQty").val(LoadData[0].æ±æ¥æ°é); //æ¥å·¥æ°é
                                $("#HBadQty").val(LoadData[0].ä¸è¯æ°é); //ä¸è¯æ°é
                                $("#HWasterQty").val(LoadData[0].æ¥åºæ°é); //æ¥åºæ°é
                                $("#HBadCount").val(LoadData[0].ä¸è¯æ°é); //ä¸è¯æ°é
                                $("#HWasterQty").val(LoadData[0].å å·¥æ¥åºæ°é); //å å·¥æ¥åºæ°é
                                $("#HWasterQty2").val(LoadData[0].å ææ¥åºæ°é); //å ææ¥åºæ°é
                                $("#HMaker").val(LoadData[0].å¶åäºº); //å¶åäºº
                                $("#HMakeDate").val(formatDate(LoadData[0].å¶åæ¥æ)); //å¶åæ¥æ
                                $("#HUpDater").val(sessionStorage["HUserName"]); //ä¿®æ¹äºº
@@ -605,7 +619,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3724' },
                    data: { "HBillType": '3714' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
@@ -687,7 +701,7 @@
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -763,8 +777,9 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HWorkManName").val(checkStatus.data[0].HName);
                        $("#HWorkManID").val(checkStatus.data[0].HItemID);
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpNumber").val(checkStatus.data[0].HNumber);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
@@ -804,6 +819,7 @@
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HGroupName").val(checkStatus.data[0].HName);
                        $("#HGroupNumber").val(checkStatus.data[0].HNumber);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -842,9 +858,10 @@
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var HQty = LoadData[0].HQty;
                        var HBadQty = LoadData[0].HBadQty;
                        var HBadCount = LoadData[0].HBadCount;
                        var HWasterQty = LoadData[0].HWasterQty;
                        var yessqty = HQty + HBadQty + HWasterQty;
                        var HWasterQty2 = LoadData[0].HWasterQty2;
                        var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
                        var sumqty = parseFloat($("#HQty").val()) + yessqty;
                        if (sumqty > parseFloat($("#HPlanQty").val())) {
                            layer.confirm("å·²æ±æ¥æ°é:ã" + yessqty + "ã,å½åæ±æ¥æ°é:ã" + parseFloat($("#HQty").val()) + "ãä¸è½å¤§äºè®¡åæ°é:ã" + parseFloat($("#HPlanQty").val()) + "ãï¼", {
@@ -869,11 +886,14 @@

            //æäº¤è¯·æ±ajax
            function Submit(data) {
                if (data.field.HBadQty == "" || data.field.HBadQty == null) {
                    data.field.HBadQty = 0;
                if (data.field.HBadCount == "" || data.field.HBadCount == null) {
                    data.field.HBadCount = 0;
                }
                if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
                    data.field.HWasterQty = 0;
                }
                if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
                    data.field.HWasterQty2 = 0;
                }
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + refSav;
@@ -994,11 +1014,11 @@
                layer.msg("äº§åç¼ç ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
            if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
            if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
                layer.msg("å¼å·¥æ¶é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
            if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
            if ($("#HRelEndDate").val() == '' || $("#HRelEndDate").val() == null) {
                layer.msg("å¼å·¥æ¶é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
@@ -1006,7 +1026,7 @@
                layer.msg("çäº§èµæºä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }
            if ($("#HWorkManID").val() == '' || $("#HWorkManID").val() == null) {
            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
                layer.msg("æä½åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html

@@ -193,7 +193,7 @@
                 option = {
                    elem: '#mainTable'
                    , height: 'full-50'
                    , page: true
                     , page: true
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
@@ -205,6 +205,8 @@
                        , { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', width: 200 }
                        , { field: 'HICMOInterID', title: 'çäº§è®¢åä¸»ID', width: 200, hide: true }
                        , { field: 'HICMOEntryID', title: 'çäº§è®¢ååID', width: 200, hide: true }
                        , { field: 'HProcNumber', title: 'å·¥åºç¼ç ', width: 200 }
                        , { field: 'HProcName', title: 'å·¥åºåç§°', width: 200 }
                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 200 }
                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 200, hide: true }
                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 200, hide: true }
@@ -232,7 +234,7 @@
            //æ¥å·¥å¹³å°è¿å¥(ææºå)
            function set_AddNew()
            {
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
@@ -264,8 +266,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    var HICMOInID = data[0].HICMOInterID.toString();
                    var HICMOEnID = data[0].HICMOEntryID.toString();
                    var HICMOInID = data[0].HSourceInterID.toString();
                    var HICMOEnID = data[0].HSourceEntryID.toString();

                    //é»è¾å é¤æ¹æ³
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -241,10 +241,12 @@
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 200 }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 200 }
                        , { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼', width: 200 }
                        , { field: 'HProcID', title: 'HProcID', width: 200, hide: true}
                        , { field: 'HProcNumber', title: 'å·¥åºä»£ç ', width: 200 }
                        , { field: 'HProcName', title: 'å·¥åºåç§°', width: 200 }
                        , { field: 'æ±æ¥æ°é', title: 'æ±æ¥æ°é', width: 200 }
                        , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 200 }
                        , { field: 'HICMOInterID', title: 'çäº§è®¢åä¸»ID', width: 200, hide: true }
                        , { field: 'HICMOEntryID', title: 'çäº§è®¢ååID', width: 200, hide: true }
                        , { field: 'æºååå·', title: 'æºååå·', width: 200 }
                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 200, hide: true }
                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 200, hide: true }
@@ -353,8 +355,8 @@
                if (checkStatus.data.length === 1) {
                    console.log(data[0]);
                    var HInterID = data[0].HInterID;
                    var HICMOInID = data[0].HICMOInterID;
                    var HICMOEnID = data[0].HICMOEntryID;
                    var HICMOInID = data[0].HSourceInterID;
                    var HICMOEnID = data[0].HSourceEntryID;
                    var HRelationInterID = data[0].HRelationInterID;
                    if (HRelationInterID == 1) {
                        layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³ä¿®æ¹ï¼');
@@ -391,8 +393,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    var HICMOInID = data[0].HICMOInterID.toString();
                    var HICMOEnID = data[0].HICMOEntryID.toString();
                    var HICMOInID = data[0].HSourceInterID.toString();
                    var HICMOEnID = data[0].HSourceEntryID.toString();
                    var HRelationInterID = data[0].HRelationInterID.toString();
                    if (HRelationInterID == 1) {
                        layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³å é¤ï¼');

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Íê¹¤/Sc_MESEndStepWorkBillList.html

@@ -252,6 +252,12 @@
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
                        , { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 115 }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 115 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115 }
                        , { field: 'HProcID', title: 'HProcID', width: 115, hide: true}
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 115 }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 115 }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
                        , { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
                        , { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }

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

@@ -261,6 +261,12 @@
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
                        , { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
                        , { field: 'HProcID', title: 'HProcID', width: 160, hide: true}
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 160 }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 160 }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
                        , { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
                        , { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }

			@@ -145,6 +145,7 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
			<input id="HProcID" name="HProcID" type="hidden" />
			<input id="HProcNumber" name="HProcNumber" type="hidden" />
			</div>
			</div>
			</div>
			@@ -152,7 +153,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">äº§åä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -194,6 +195,7 @@
			<label class="layui-form-label">çäº§çç»:</label>
			<div class="layui-input-inline">
			<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupNumber" id="HGroupNumber" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -205,8 +207,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">æä½å:</label>
			<div class="layui-input-inline">
			<input type="text" name="HWorkManName" id="HWorkManName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWorkManID" id="HWorkManID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpNumber" id="HEmpNumber" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -215,16 +218,21 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HBadQty" lay-verify="HBadQty" id="HBadQty" autocomplete="off">
			<input class="layui-input" name="HBadCount" lay-verify="HBadCount" id="HBadCount" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥åºæ°é:</label>
			<label class="layui-form-label">å å·¥æ¥åºæ°:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">å ææ¥åºæ°:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			@@ -238,13 +246,13 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¼å·¥æ¶é´:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥å·¥æ¶é´:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			</div>
			@@ -396,11 +404,11 @@
			function set_InitFrom() {
			//æ¥ææ¶é´éæ©å¨
			laydate.render({
			elem: '#HWorkBeginDate'
			elem: '#HRelBeginDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HWorkReportDate'
			elem: '#HRelEndDate'
			, type: 'datetime'
			});
			laydate.render({
			@@ -434,7 +442,7 @@
			{
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //æ¥å·¥æ¥æ
			$("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //æ¥å·¥æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //å¶åæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //å¶åäºº
			}
			@@ -444,7 +452,7 @@
			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //æ¥å·¥æ¥æ
			$("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //æ¥å·¥æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //å¶åæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //å¶åäºº

			@@ -453,15 +461,15 @@
			$('#HSourceBillNo').attr("disabled", true);
			$('#HProcExchBillNo').attr("disabled", true);
			$('#HProcName').attr("disabled", true);
			$('#HMaterCode').attr("disabled", true);
			$('#HMaterNumber').attr("disabled", true);
			$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
			$('#HMaterName').attr("disabled", true);
			$('#HMaterSpec').attr("disabled", true);
			$('#HPlanQty').attr("disabled", true);
			$('#HSourceName').attr("disabled", true);
			$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
			$('#HWorkBeginDate').attr("disabled", true);
			$('#HWorkReportDate').attr("disabled", true);
			$('#HRelBeginDate').attr("disabled", true);
			$('#HRelEndDate').attr("disabled", true);

			$.ajax(
			{
			@@ -480,9 +488,10 @@
			{
			var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
			$("#HProcID").val(LoadData[0].HProcID); //å½åå·¥åºID
			$("#HProcNumber").val(LoadData[0].HProcNumber); //å½åå·¥åºç¼ç
			$("#HProcName").val(LoadData[0].HProcName); //å½åå·¥åº
			$("#HMaterID").val(LoadData[0].HMaterID); //äº§åID
			$("#HMaterCode").val(LoadData[0].HMaterNumber); //äº§åä»£ç
			$("#HMaterNumber").val(LoadData[0].HMaterNumber); //äº§åä»£ç
			$("#HMaterName").val(LoadData[0].HMaterName); //äº§ååç§°
			$("#HMaterSpec").val(LoadData[0].HModel); //äº§åè§æ ¼
			$("#HSourceID").val(LoadData[0].HSourceID); //çäº§èµæºID
			@@ -492,11 +501,12 @@
			$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			$("#HSourceBillType").val(HSourceBillType); //æºåç±»å
			$("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
			$("#HGroupNumber").val(LoadData[0].HDeptNumber); //çç»ç¼ç
			$("#HGroupName").val(LoadData[0].HDeptName); //çç»
			$("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			$("#HWorkBeginDate").val(LoadData[0].HBeginDate); //å¼å·¥æ¶é´
			$("#HRelBeginDate").val(LoadData[0].HBeginDate); //å¼å·¥æ¶é´
			$("#HPlanQty").val(LoadData[0].HDatePlanQty); //è®¡åæ°é

			}
			@@ -520,15 +530,15 @@
			$('#HSourceBillNo').attr("disabled", true);
			$('#HProcExchBillNo').attr("disabled", true);
			$('#HProcName').attr("disabled", true);
			$('#HMaterCode').attr("disabled", true);
			$('#HMaterNumber').attr("disabled", true);
			$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
			$('#HMaterName').attr("disabled", true);
			$('#HMaterSpec').attr("disabled", true);
			$('#HPlanQty').attr("disabled", true);
			$('#HSourceName').attr("disabled", true);
			$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
			$('#HWorkBeginDate').attr("disabled", true);
			$('#HWorkReportDate').attr("disabled", true);
			$('#HRelBeginDate').attr("disabled", true);
			$('#HRelEndDate').attr("disabled", true);

			$.ajax(
			{
			@@ -548,10 +558,11 @@
			$("#HInterID").val(LoadData[0].HInterID); //åæ®ID
			$("#HBillNo").val(LoadData[0].åæ®å·); //åæ®å·
			$("#HDate").val(formatDate(LoadData[0].æ¥æ)); //æ¥æ
			$("#HProcID").val(""); //å½åå·¥åºID
			$("#HProcName").val(""); //å½åå·¥åº
			$("#HProcID").val(LoadData[0].HProcID); //å½åå·¥åºID
			$("#HProcNumber").val(LoadData[0].HProcNumber); //å½åå·¥åºç¼ç
			$("#HProcName").val(LoadData[0].HProcName); //å½åå·¥åº
			$("#HMaterID").val(LoadData[0].HMaterID); //äº§åID
			$("#HMaterCode").val(LoadData[0].äº§åä»£ç ); //äº§åä»£ç
			$("#HMaterNumber").val(LoadData[0].äº§åä»£ç ); //äº§åä»£ç
			$("#HMaterName").val(LoadData[0].äº§ååç§°); //äº§ååç§°
			$("#HMaterSpec").val(LoadData[0].äº§åè§æ ¼); //äº§åè§æ ¼
			$("#HSourceID").val(LoadData[0].HSourceID); //çäº§èµæºID
			@@ -561,18 +572,21 @@
			$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			$("#HSourceBillType").val(LoadData[0].æºåç±»å); //æºåç±»å
			$("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
			$("#HGroupNumber").val(LoadData[0].çäº§çç»ä»£ç ); //çç»ç¼ç
			$("#HGroupName").val(LoadData[0].çäº§çç»); //çç»
			$("#HWorkManID").val(LoadData[0].HWorkManID); //æä½åID
			$("#HWorkManName").val(LoadData[0].æä½å); //æä½å
			$("#HEmpID").val(LoadData[0].HWorkManID); //æä½åID
			$("#HEmpNumber").val(LoadData[0].æä½åç¼ç ); //æä½åç¼ç
			$("#HEmpName").val(LoadData[0].æä½å); //æä½å
			$("#HICMOInterID").val(LoadData[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			$("#HWorkBeginDate").val(formatDate(LoadData[0].å¼å·¥æ¶é´)); //å¼å·¥æ¶é´
			$("#HWorkReportDate").val(formatDate(LoadData[0].æ¥å·¥æ¶é´)); //æ¥å·¥æ¶é´
			$("#HRelBeginDate").val(formatDate(LoadData[0].å¼å·¥æ¶é´)); //å¼å·¥æ¶é´
			$("#HRelEndDate").val(formatDate(LoadData[0].æ¥å·¥æ¶é´)); //æ¥å·¥æ¶é´
			$("#HPlanQty").val(LoadData[0].HDatePlanQty); //è®¡åæ°é
			$("#HQty").val(LoadData[0].æ±æ¥æ°é); //æ¥å·¥æ°é
			$("#HBadQty").val(LoadData[0].ä¸è¯æ°é); //ä¸è¯æ°é
			$("#HWasterQty").val(LoadData[0].æ¥åºæ°é); //æ¥åºæ°é
			$("#HBadCount").val(LoadData[0].ä¸è¯æ°é); //ä¸è¯æ°é
			$("#HWasterQty").val(LoadData[0].å å·¥æ¥åºæ°é); //å å·¥æ¥åºæ°é
			$("#HWasterQty2").val(LoadData[0].å ææ¥åºæ°é); //å ææ¥åºæ°é
			$("#HMaker").val(LoadData[0].å¶åäºº); //å¶åäºº
			$("#HMakeDate").val(formatDate(LoadData[0].å¶åæ¥æ)); //å¶åæ¥æ
			$("#HUpDater").val(sessionStorage["HUserName"]); //ä¿®æ¹äºº
			@@ -605,7 +619,7 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3724' },
			data: { "HBillType": '3714' },
			success: function (d) {
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInterID").val(0);
			@@ -687,7 +701,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterCode").val(checkStatus.data[0].HNumber);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -763,8 +777,9 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWorkManName").val(checkStatus.data[0].HName);
			$("#HWorkManID").val(checkStatus.data[0].HItemID);
			$("#HEmpName").val(checkStatus.data[0].HName);
			$("#HEmpNumber").val(checkStatus.data[0].HNumber);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -804,6 +819,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].HName);
			$("#HGroupNumber").val(checkStatus.data[0].HNumber);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -842,9 +858,10 @@
			success: function (datas) {
			var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
			var HQty = LoadData[0].HQty;
			var HBadQty = LoadData[0].HBadQty;
			var HBadCount = LoadData[0].HBadCount;
			var HWasterQty = LoadData[0].HWasterQty;
			var yessqty = HQty + HBadQty + HWasterQty;
			var HWasterQty2 = LoadData[0].HWasterQty2;
			var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
			var sumqty = parseFloat($("#HQty").val()) + yessqty;
			if (sumqty > parseFloat($("#HPlanQty").val())) {
			layer.confirm("å·²æ±æ¥æ°é:ã" + yessqty + "ã,å½åæ±æ¥æ°é:ã" + parseFloat($("#HQty").val()) + "ãä¸è½å¤§äºè®¡åæ°é:ã" + parseFloat($("#HPlanQty").val()) + "ãï¼", {
			@@ -869,11 +886,14 @@

			//æäº¤è¯·æ±ajax
			function Submit(data) {
			if (data.field.HBadQty == "" \|\| data.field.HBadQty == null) {
			data.field.HBadQty = 0;
			if (data.field.HBadCount == "" \|\| data.field.HBadCount == null) {
			data.field.HBadCount = 0;
			}
			if (data.field.HWasterQty == "" \|\| data.field.HWasterQty == null) {
			data.field.HWasterQty = 0;
			}
			if (data.field.HWasterQty2 == "" \|\| data.field.HWasterQty2 == null) {
			data.field.HWasterQty2 = 0;
			}
			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + refSav;
			@@ -994,11 +1014,11 @@
			layer.msg("äº§åç¼ç ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HWorkBeginDate").val() == '' \|\| $("#HWorkBeginDate").val() == null) {
			if ($("#HRelBeginDate").val() == '' \|\| $("#HWorkBeginDate").val() == null) {
			layer.msg("å¼å·¥æ¶é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HWorkReportDate").val() == '' \|\| $("#HWorkReportDate").val() == null) {
			if ($("#HRelEndDate").val() == '' \|\| $("#HRelEndDate").val() == null) {
			layer.msg("å¼å·¥æ¶é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			@@ -1006,7 +1026,7 @@
			layer.msg("çäº§èµæºä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HWorkManID").val() == '' \|\| $("#HWorkManID").val() == null) {
			if ($("#HEmpID").val() == '' \|\| $("#HEmpID").val() == null) {
			layer.msg("æä½åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}

			@@ -193,7 +193,7 @@
			option = {
			elem: '#mainTable'
			, height: 'full-50'
			, page: true
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			@@ -205,6 +205,8 @@
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', width: 200 }
			, { field: 'HICMOInterID', title: 'çäº§è®¢åä¸»ID', width: 200, hide: true }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢ååID', width: 200, hide: true }
			, { field: 'HProcNumber', title: 'å·¥åºç¼ç ', width: 200 }
			, { field: 'HProcName', title: 'å·¥åºåç§°', width: 200 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 200 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 200, hide: true }
			@@ -232,7 +234,7 @@
			//æ¥å·¥å¹³å°è¿å¥(ææºå)
			function set_AddNew()
			{
			sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
			sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
			SchWhere = sWhere;
			console.log(sWhere);
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -264,8 +266,8 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].HInterID.toString();
			var HICMOInID = data[0].HICMOInterID.toString();
			var HICMOEnID = data[0].HICMOEntryID.toString();
			var HICMOInID = data[0].HSourceInterID.toString();
			var HICMOEnID = data[0].HSourceEntryID.toString();

			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {

			@@ -241,10 +241,12 @@
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 200 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 200 }
			, { field: 'äº§åè§æ ¼', title: 'äº§åè§æ ¼', width: 200 }
			, { field: 'HProcID', title: 'HProcID', width: 200, hide: true}
			, { field: 'HProcNumber', title: 'å·¥åºä»£ç ', width: 200 }
			, { field: 'HProcName', title: 'å·¥åºåç§°', width: 200 }
			, { field: 'æ±æ¥æ°é', title: 'æ±æ¥æ°é', width: 200 }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 200 }
			, { field: 'HICMOInterID', title: 'çäº§è®¢åä¸»ID', width: 200, hide: true }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢ååID', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 200, hide: true }
			@@ -353,8 +355,8 @@
			if (checkStatus.data.length === 1) {
			console.log(data[0]);
			var HInterID = data[0].HInterID;
			var HICMOInID = data[0].HICMOInterID;
			var HICMOEnID = data[0].HICMOEntryID;
			var HICMOInID = data[0].HSourceInterID;
			var HICMOEnID = data[0].HSourceEntryID;
			var HRelationInterID = data[0].HRelationInterID;
			if (HRelationInterID == 1) {
			layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³ä¿®æ¹ï¼');
			@@ -391,8 +393,8 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].HInterID.toString();
			var HICMOInID = data[0].HICMOInterID.toString();
			var HICMOEnID = data[0].HICMOEntryID.toString();
			var HICMOInID = data[0].HSourceInterID.toString();
			var HICMOEnID = data[0].HSourceEntryID.toString();
			var HRelationInterID = data[0].HRelationInterID.toString();
			if (HRelationInterID == 1) {
			layer.msg('åæ®å·²æ¥æ£å®¡æ ¸æ æ³å é¤ï¼');

			@@ -252,6 +252,12 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 115 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 115 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115 }
			, { field: 'HProcID', title: 'HProcID', width: 115, hide: true}
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 115 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 115 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }

			@@ -261,6 +261,12 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'HProcID', title: 'HProcID', width: 160, hide: true}
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 160 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 160 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }