duhe
2025-03-19 6a7a8a48ecac38ada309b64a006382a3d867bf75
生产领料单
基础资料-物料:增加字段 采购计量单位
4个文件已修改
4731 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 4657 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/生产领料/Kf_ProductReceiveMaterialBillEdit.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
Diff too large
WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html
@@ -612,6 +612,18 @@
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">采购计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HPOUnitName" id="HPOUnitName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HPOUnitID" id="HPOUnitID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HPOUnitList" id="HPOUnitList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
@@ -1061,6 +1073,8 @@
                                , "HSALEPRICEUNITName": data.销售计价计量单位
                                , "HBASEUNITName": data.基本计量单位
                                , "HSTOREUNITName": data.库存计量单位
                                , "HPOUnitID": data.HPOUnitID
                                , "HPOUnitName": data.采购计量单位
                                , "HCHECKINCOMING": data.是否来料检验
                                , "HCHECKPRODUCT": data.是否产品检验
                                , "HPERUNITSTANDHOUR": data.标准工时
@@ -1839,6 +1853,34 @@
                    , btn2: function (index, layero) { }
                })
            });
            //选择采购计量单位
            form.on('submit(HPOUnitList)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '采购计量单位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/基础资料/公用基础资料/Gy_Unit.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HPOUnitName").val(checkStatus.data[0].计量单位名称);
                        $("#HPOUnitID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //清空界面
            function set_ClearBill() {
WebTM/views/ÁìÁÏ·¢»õ/Éú²úÁìÁÏ/Kf_ProductReceiveMaterialBillEdit.html
@@ -930,8 +930,6 @@
                            allVal = result.data[0];
                            var data = result.data[0];
                            HBillSubType = data.HBillSubType;
                            //根据客户带出联系人、联系电话
                            getCustomerByCusID(data.HSupID);
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
@@ -979,7 +977,7 @@
                                        , "计量单位": result.data[i].计量单位
                                        , "HQtyMust": dealDoubleToFixed(result.data[i].应发数量, 1)
                                        , "HQty": dealDoubleToFixed(result.data[i].数量, 1)
                                        , "HWHID": result.data[i].hwhid
                                        , "HWHID": result.data[i].HWHID
                                        , "发货仓库": result.data[i].发货仓库
                                        , "HRemark": result.data[i].表体备注
@@ -990,20 +988,20 @@
                                        , "HRelationQty": result.data[i].关联数量
                                        , "HRelationMoney": result.data[i].关联金额
                                        , 'HSPID': result.data[i].HSPID
                                        , 'HSPName': result.data[i].仓位
                                        , 'HSPGroupID': result.data[i].HSPGroupID
                                        , "HSPGroupName": result.data[i].仓位组
                                        , 'HSCWHID': result.data[i].HSCWHID
                                        , 'HSCWHName': result.data[i].调出仓库
                                        , 'HSCSPID': result.data[i].HSCSPID
                                        , 'HSCSPName': result.data[i].调出仓位
                                        , 'HBatchNo': result.data[i].批次
                                        //, 'HSPID': result.data[i].HSPID
                                        //, 'HSPName': result.data[i].仓位
                                        //, 'HSPGroupID': result.data[i].HSPGroupID
                                        //, "HSPGroupName": result.data[i].仓位组
                                        //, 'HSCWHID': result.data[i].HSCWHID
                                        //, 'HSCWHName': result.data[i].调出仓库
                                        //, 'HSCSPID': result.data[i].HSCSPID
                                        //, 'HSCSPName': result.data[i].调出仓位
                                        //, 'HBatchNo': result.data[i].批次
                                        , 'HPropertyID': result.data[i].HPropertyID
                                        , 'HPropertyName': result.data[i].辅助属性
                                        , 'HSecUnitID': result.data[i].HSecUnitID
                                        , 'HSecUnitName': result.data[i].辅助计量单位
                                        //, 'HPropertyID': result.data[i].HPropertyID
                                        //, 'HPropertyName': result.data[i].辅助属性
                                        //, 'HSecUnitID': result.data[i].HSecUnitID
                                        //, 'HSecUnitName': result.data[i].辅助计量单位
                                    }
                                )
                            }