工序流转卡 功能更新

yangle

2022-06-02 f6b711a161021377b17e161d5bbd36d2aa47d1b3

工序流转卡 功能更新

 WebTM/WebTM.csproj

@@ -1350,6 +1350,7 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\日计划报表\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

 WebTM/views/index.html

@@ -403,6 +403,14 @@
                                                <dd><a lay-href="生产管理/即时库存/JIT_InventoryList.html" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <!--<dd><a lay-href="生产管理/日计划报表/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">提料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">要料计划信息列表</a></dd>-->
                                            </dl>
                                        </dd>
                                    </dl>
                                </dd>
                            </dl>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillEdit.html

@@ -272,8 +272,8 @@
                                            <label class="layui-form-label" style="width: 85px;">生产订单号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
                                                <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
                                                <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
                                                <input type="text" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden />
                                                <input type="text" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden />
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -574,11 +574,11 @@
            set_ClearBill();

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}

            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -62,6 +62,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                            </div>
                        </script>
                    </form>
@@ -119,6 +120,9 @@
                    break;
                //关闭
                case 'set_CloseBill': set_CloseBill();
                    break;
                //下推
                case 'set_TuiBill': set_TuiBill();
                    break;
            };
        });
@@ -435,6 +439,25 @@
        }
            //#endregion

        //编辑单据 ä¸‹æŽ¨
        function set_TuiBill() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (data.length === 1) {
                var linterid = data[0].源单主内码.toString();
                var HEntryID = data[0].源单子内码.toString();
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '工序流转卡-编辑'
                    , shift: 0//弹出动画
                    , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
                })
            } else {
                layer.msg('请选择一行数据下推！');
            }
        }

        //#endregion
        //以上是layui模块
    });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -317,6 +317,15 @@
                                                <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">日计划工单选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="WorkBillSortNo" id="WorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">流转卡类型</label>
                                            <div class="layui-input-inline">
@@ -645,6 +654,20 @@
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
               
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
                    type: "GET",
                    data: { "sWhere": " and æºå•ä¸»å†…码='" + linterid + "' and æºå•å­å†…码='" + HEntryID + "' ", "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        if (d.data[0] != null) {
                            $("#WorkBillSortNo").val(d.data[0].单据号);
                        }
                    }
                })
                        
                 
               
                GetICMOBillValue(linterid, HEntryID);
                option.data = [{
                    "HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
@@ -1171,7 +1194,32 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                       
                        GetICMOBillValue(checkStatus.data[0].hmainid, checkStatus.data[0].HEntryID)
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });

            //选择日计划工单
            form.on('submit(btnSearchWorkBillSort)', function () {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产任务单列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../../views/生产管理/生产日计划工单/JIT_DayPlanBillList.html', 'yes']
                    , 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('请选择数据');
                        }
                        $("#WorkBillSortNo").val(checkStatus.data[0].单据号);
                        GetICMOBillValue(checkStatus.data[0].源单主内码, checkStatus.data[0].源单子内码)
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -1198,7 +1246,14 @@
                    layer.msg("请选择计划完工日期！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sSubTable = table.cache['mainTable'];
                //删除子表数据时 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
                var sSubTable = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        sSubTable.push(table.cache["mainTable"][i])
                    }
                }
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HProcNo) {
                        var indexRow = i + 1;
@@ -1232,7 +1287,7 @@
                var HBLFlag = document.getElementById("HBLFlag").checked;
                HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//将数组合并成字符串
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr = JSON.stringify(sSubTable);
                var flag = "xz";
                if (OperationType == 3) {
                    flag = "xg";
@@ -1336,6 +1391,7 @@
                                , "HWorkShopName": data.生产车间
                                , "HWorkShopID": data.HWorkShopID
                                , "textBox2": data.任务单号
                                , "WorkBillSortNo": data.日计划工单号
                                , "HSupName": data.委外加工单位
                                , "HSupID": data.HSupID
                                , "HMaterName": data.子件名称