ch
2022-01-23 1b30a42460599a211120af2eeb6c0f074b58d871
新增了拆箱单  扫描条码单页签功能
5个文件已修改
237 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_Mobile.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 180 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/home/console_Mobile.html
@@ -82,6 +82,12 @@
                                      <cite>调拨单</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-find-fill"></i>
                                      <cite>生产拆箱单</cite>
                                  </a>
                              </li>
                          </ul>
                      </div>
                  </div>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -50,21 +50,11 @@
                                                <option value="3720">生产任务单-投料</option>
                                                <option value="1243">调拨申请单</option>
                                                <!--<option value="1201">委外订单-投料</option>
                                <option value="1402">发货通知单</option>
                                <option value="1234">下架通知单</option>
                                <option value="1243">调拨申请单</option>-->
                    <option value="1402">发货通知单</option>
                    <option value="1234">下架通知单</option>
                    <option value="1243">调拨申请单</option>-->
                                            </select>
                                            <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单号</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
@@ -122,6 +112,16 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">源单号</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--表头信息-->
                            <div class="layui-tab-item">
WebTM/views/Éú²ú¹ÜÀí/Éú²ú²ðÏäµ¥/Sc_PackSplitBill_Fast.html
@@ -539,12 +539,10 @@
            var HTBarCode = $('#HTBarCode').val()
            var HOrgID = sessionStorage["OrganizationID"]
            var sMaker = sessionStorage["HUserName"]
            if (AllowLoadData(sSubStr) != false)//非空验证
            {
                layer.load(3);
                $.ajax(
                {
                    type: "POST",
                    type: "GET",
                        url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
                    async: true,
                        data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
@@ -569,8 +567,6 @@
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                return false;
            }
        });
        //监听提交
@@ -593,16 +589,13 @@
                if (event.keyCode == 13) {
                    var sBarCode = $('#HBarCode').val()
                    //var Flag = sessionStorage["SourceFlag"];
                    if (sQty == "") {
                        sQty = 0;
                    }
                    //判断条码是否为空  new
                    if (sBarCode == '') {
                    if (HBarCode == '') {
                            playSound();
                            layer.msg("条码为空,不能扫描!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        if (sBarCode != "") {
                        if (HBarCode != "") {
                            $('#HBarCode').val("");
                        }
                        $.ajax({
@@ -696,17 +689,17 @@
                    layer.msg("拖条码为空,不能扫描!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (HTBarCode != "") {
                    $('#HTBarCode').val("");
                }
                //if (HTBarCode != "") {
                //    $('#HTBarCode').val("");
                //}
                //
                $.ajax({
                    url: GetWEBURL() + "/PackSplitBill/SetPackBarCode_Webs",
                    type: "GET",
                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOrgID": HOrgID },
                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $('#HTBarCode').val(result.data.HSourceBillNo);
                            //$('#HTBarCode').val(result.data.HSourceBillNo);
                            $("#HTBarCode").attr("disabled", "true");
                            layer.load(3)
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -222,12 +222,112 @@
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                                <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBarCode_B" id="HBarCode_B" lay-verify="HBarCode_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">物料</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HMaterName_B" id="HMaterName_B" lay-verify="HMaterName_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">规格</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">规格</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">批次</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBatchNo_B" id="HBatchNo_B" lay-verify="HBatchNo_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">单位</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HUnitName_B" id="HUnitName_B" lay-verify="HUnitName_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HQty_B" id="HQty_B" lay-verify="HQty_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">容量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HTMQty_B" id="HTMQty_B" lay-verify="HTMQty_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">仓库</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HWHName_B" id="HWHName_B" lay-verify="HWHName_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:15px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">仓位</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSPName_B" id="HSPName_B" lay-verify="HSPName_B" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                                </div>
                            </div>
                        </div>
                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
@@ -850,31 +950,30 @@
                            //$("#HDeptID").val(result.data.HDeptID);
                            //$("#HDeptName").val(result.data.HDeptName);
                            layer.load(3)
                            table.render({
                                elem: '#wl-table'
                          , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
                          , toolbar: '#toolbarDemo'
                          , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
                          , cellMinWidth: 90
                          , cols: [[
                              { type: 'radio' }
                            , { field: 'HSNO', title: '序号', width: 60 }
                            , { field: 'HQty', title: '数量', width: 80 }
                            , { field: 'HQtyMust', title: '应发数量', width: 80 }
                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                            , { field: 'HMaterModel', title: '规格型号', width: 150 }
                            , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                            , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                            , { field: 'HBatchNo', title: '批次', width: 150 }
                          ]]
                                // , data: [linterid]
                                // , page: true
                          , height: 500
                          , done: function () {
                              layer.closeAll("loading");
                          }
                            $.ajax({
                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
                                type: "GET",
                                data: { HBillID: sInterID, HBillType: '1204', sWhere: ''  },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        listOption.data = result.data.list;
                                        table.render(listOption);
                                        $("#HBarCode_B").val(result.data.list1[0].HBarCode);
                                        $("#HMaterName_B").val(result.data.list1[0].HMaterName);
                                        $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
                                        $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
                                        $("#HUnitName_B").val(result.data.list1[0].HUnitName);
                                        $("#HQty_B").val(result.data.list1[0].HQty);
                                        $("#HTMQty_B").val(result.data.list1[0].HTMQty);
                                        $("#HWHName_B").val(result.data.list1[0].HWHName);
                                        $("#HSPName_B").val(result.data.list1[0].HSPName);
                                    }
                                    else {
                                        layer.msg(result.Message);
                                    }
                                    layer.closeAll("loading");
                                }
                            });
                        }
                        else {
@@ -887,7 +986,28 @@
            }
        });
        var listOption = {
            elem: '#wl-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , cols: [[
                { type: 'radio' }
                , { field: 'HSNO', title: '序号', width: 60 }
                , { field: 'HQty', title: '数量', width: 80 }
                , { field: 'HQtyMust', title: '应发数量', width: 80 }
                , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                , { field: 'HMaterName', title: '物料名称', width: 150 }
                , { field: 'HMaterModel', title: '规格型号', width: 150 }
                , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                , { field: 'HBatchNo', title: '批次', width: 150 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        function playSound() {