生产订单增加订单包装备注字段，物料表增加单件最大上限字段,并完善界面 生产订单列表 增加 包装备注 字段，选择 某个生产订单， 点击按钮，弹出一个 小...

cwjbxqmz

2023-11-14 becc7051ccc7961317889f54b1ea723ff214d83f

生产订单增加订单包装备注字段，物料表增加单件最大上限字段,并完善界面
生产订单列表 增加 包装备注 字段，选择 某个生产订单， 点击按钮，弹出一个 小框， 输入 订单包装备注 信息，保存 数据到 生产订单 子表里，UPDATE这个字段；

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\乔一计量单位列表\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,8 +5,8 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*    var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/index.html

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

@@ -323,6 +323,12 @@
                                                        <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" > å•ä»¶æœ€å¤§ä¸Šé™ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPieceMaxQty" lay-verify="HPieceMaxQty" id="HPieceMaxQty" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
@@ -796,6 +802,7 @@
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                                , "HColorRemark": data.染色要求
                                , "HPieceMaxQty": data.单件最大上限
                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
                                , "HQCSchemeName_Fst": data.首件检验方案
                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
@@ -986,6 +993,18 @@
                    }
                }

                var HPieceMaxQty = $('#HPieceMaxQty').val();
                if (HPieceMaxQty.substring(HPieceMaxQty.length - 1, HPieceMaxQty.length) == ".") {
                    layer.msg("单件最大上限的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HPieceMaxQty)) {
                        layer.msg("单件最大上限请输正确入数字！");
                        return;
                    }
                }

                var HKeepDays = $('#HKeepDays').val();
                if (HKeepDays.substring(HKeepDays.length - 1, HKeepDays.length) == ".") {
                    layer.msg("保质期的结尾不能是.！");

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -124,7 +124,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 85px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -273,6 +273,12 @@
                                            <label class="layui-form-label" style="width: 85px;">白坯要求</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">订单包装备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
@@ -1027,6 +1033,7 @@
                            , "HColorRemark": d.data[0].染色要求
                            , "HCusMaterName": d.data[0].客户物料名称
                            , "HCusModel": d.data[0].客户规格型号
                            , "HOrderPickRemark": d.data[0].订单包装备注
                            //其他信息
                            , "hmakers": OperationType == 2 ? "" : d.data[0].制单人
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -208,6 +208,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>包装备注</button>
                            </div>
                        </script>
                    </form>
@@ -379,6 +380,9 @@
                    //首检
                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
                        break;
                    //包装备注
                    case 'set_Remark': set_Remark();
                        break;
                };
            });

@@ -508,6 +512,7 @@
                    , { field: '关闭类型', title: '关闭类型', hide: true }
                    , { field: '单据类型', title: '单据类型', hide: true }
                    , { field: '计划跟踪号', title: '计划跟踪号', hide: true }
                    , { field: '订单包装备注', title: '订单包装备注', hide: true}
                ]]
            };

@@ -596,6 +601,7 @@
                        //, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
                        , { field: '工艺路线代码', title: '工艺路线代码', sort: true}
                        , { field: '工艺路线', title: '工艺路线', sort: true}
                        , { field: '订单包装备注', title: '订单包装备注', sort: true, width: 150}
                        //, { field: 'hsubid', title: 'hsubid' , hide: true}
                        //, { field: '源单单号', title: '源单单号', hide: true}
                        //, { field: '源单主内码', title: '源单主内码', hide: true}
@@ -957,6 +963,43 @@
                }
            }


            //包装备注
            function set_Remark() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].hsubid.toString();
                 layer.prompt({ formType: 2, title: "请输入订单包装备注", value: '' },
                     function (value, index) {
                         layer.close(index);
                         var HOrderPickRemark = value;
                         var index = layer.load();
                         $.ajax({
                             url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
                             type: "GET",
                             data: {
                                 "HInterID": linterid
                                 , "HEntryID": HEntryID
                                 , "HOrderPickRemark": HOrderPickRemark
                             },
                             success: function (data1) {
                                 //刷新页面,
                                 $("#btnSearch").trigger('click');
                                 layer.close(index);
                                 layer.msg("提交成功");
                             }, error: function () {
                                 layer.close(index);
                                 layer.msg("错误");
                             }
                         });
                     });
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            // å¤åˆ¶
            function set_copy() {
                var checkStatus = table.checkStatus('mainTable')
@@ -1275,7 +1318,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•
                            var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线","订单包装备注", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');