Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2025-11-03 486cb9f344acc45ecf0ce652fab7fbcf0f2bc45a

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -122,7 +122,7 @@
                                                        <label class="layui-form-label">当前工序:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
                                                            <input id="HProcID" name="HProcID" value="0"  type="hidden" />
                                                            <input id="HProcID" name="HProcID" value="0" type="hidden" />
                                                        </div>
                                                    </div>
                                                </div>
@@ -202,15 +202,15 @@
                                                    <div class="layui-inline" style="display:none">
                                                        <label class="layui-form-label">源单行号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" value="0"  autocomplete="off" disabled>
                                                            <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产订单:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0"  />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0"  />
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
                                                        </div>
                                                    </div>
                                                </div>
@@ -246,6 +246,14 @@
                                                        </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="HPeopleSum" lay-verify="HPeopleSum" id="HPeopleSum" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-tab-item">
@@ -601,6 +609,7 @@
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HPeopleSum": data.开工人数                        //开工人数
                                , "HRemark": data.备注                    //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
@@ -1375,6 +1384,10 @@
                    layer.msg("车间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HPeopleSum").val() == '' || $("#HPeopleSum").val() == null || $("#HPeopleSum").val() == 0) {
                    layer.msg("开工人数不能为0！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if (OperationType == "2") {
                    if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                        layer.msg("生产订单不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1518,12 +1531,12 @@
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                                $("#HWorkShiftID").val(LoadData[0].HInterID); //当前工序ID
                                $("#HWorkShiftID").val(LoadData[0].HInterID); //当前工序ID  
                                $("#HWorkShiftName").val(LoadData[0].班次); //当前工序
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                            //else {
                            //    layer.alert(data.Message, { icon: 5 });
                            //}
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });