流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量...

yangle

2023-05-16 f2023ce86836cebf4a241fbc7225c3a7dec6d86c

流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去

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

@@ -98,6 +98,15 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">是否取库存</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
                                                    <option value="0" selected>否</option>
                                                    <option value="1">是</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -155,15 +164,15 @@
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产资源</label>
                                            <div class="layui-input-block" style="margin-left: 75px;">
                                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>-->
            <label class="layui-form-label" style="width: 85px;">生产资源</label>
            <div class="layui-input-block" style="margin-left: 75px;">
                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                </button>
            </div>
        </div>-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">计量单位*</label>
                                            <div class="layui-input-block" style="margin-left: 71px;">
@@ -252,6 +261,14 @@
                                            <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>
                                    <div class="layui-row">
                                        <div class="layui-inline" style="width: 56%;">
                                            <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="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="请输入内容" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
@@ -981,6 +998,7 @@
                            , "HUnitID": d.data[0].HUnitID
                            , "HUnitName": d.data[0].计量单位
                            , "HSTATUS": HSTATUS
                            , "HIsStockQty": d.data[0].HIsStockQty
                            , "HBomID": d.data[0].HBomID
                            , "HBomName": d.data[0].BOM单编码
                            , "HPlanBeginDate": Format(new Date(d.data[0].计划开工日期), "yyyy-MM-dd")
@@ -988,6 +1006,7 @@
                            , "HBeginDate": Format(new Date(d.data[0].最迟开工日期), "yyyy-MM-dd")
                            , "HEndDate": Format(new Date(d.data[0].最迟完工日期), "yyyy-MM-dd")
                            , "HRemark": d.data[0].表头备注
                            , "HRemark3": d.data[0].底部备注
                            , "HAuxQty": d.data[0].HAuxQty
                            , "HAuxUnit": d.data[0].HAuxUnit
                            , "HAuxUnitName": d.data[0].HAuxUnitName

 WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/Kf_QCStockInCheckBill_Fast.html

@@ -339,7 +339,9 @@
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-upload">
                                        <button type="button" class="layui-btn" id="testList">选择文件</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
                                        <button type="button" class="layui-btn" id="testList">选择文件</button>
                                        <!--<input class="layui-upload-file" type="file" accept="" name="file" multiple="">-->
                                        <button type="button" class="layui-btn" id="camera" capture="user"><i class="layui-icon"></i>拍照上传</button>
                                        <div class="layui-upload-list">
                                            <table class="layui-table">
                                                <thead>
@@ -548,6 +550,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        PicUpload();
                        PicUploads();
                    }
                });
            }
@@ -1144,6 +1147,69 @@
                audio.play();
            }

          
            //拍照上传
            function PicUploads() {
                var ProImgByList = $('#ProImgByList')
                    , uploadListIns = upload.render({
                        elem: '#camera'
                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile2"
                        , accept: 'file'
                        , multiple: true
                        , acceptMime: 'image/*'
                        , auto: false
                        //, bindAction: '#testListAction' //按扭绑定
                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
                        , choose: function (obj) {
                            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                            //读取本地文件
                            obj.preview(function (index, file, result) {
                                var tr = $(['<tr id="upload-' + index + '">'
                                    , '<td>' + file.name + '</td>'
                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
                                    , '<td>等待上传</td>'
                                    , '<td>'
                                    , '<button class="layui-btn layui-btn-xs demo-reload ">上传</button>'
                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                                    , '</td>'
                                    , '</tr>'].join(''));

                                //单个重传
                                tr.find('.demo-reload').on('click', function () {
                                    obj.upload(index, file);
                                    return false;
                                });

                                //删除
                                tr.find('.demo-delete').on('click', function () {
                                    delete files[index]; //删除对应的文件
                                    tr.remove();
                                    uploadListIns.config.elem.next()[0].value = ''; //清空 input file å€¼ï¼Œä»¥å…åˆ é™¤åŽå‡ºçŽ°åŒåæ–‡ä»¶ä¸å¯é€‰
                                });

                                ProImgByList.append(tr);
                            });
                        }
                        , done: function (res, index, upload) {
                            if (res.code == 1) { //上传成功
                                var tr = ProImgByList.find('tr#upload-' + index)
                                    , tds = tr.children();
                                tds.eq(2).html('<span style="color: #5FB878;">上传成功</span>');
                                tds.eq(3).html(''); //清空操作
                                //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //隐藏上传
                                return delete this.files[index]; //删除文件队列已经上传成功的文件
                            }
                            this.error(index, upload);
                        }
                        , error: function (index, upload) {
                            var tr = ProImgByList.find('tr#upload-' + index)
                                , tds = tr.children();
                            tds.eq(2).html('<span style="color: #FF5722;">上传失败[检查文件名及文件格式]</span>');
                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示上传
                        }

                    });
            }

            //文件上传
            function PicUpload() {

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

@@ -167,6 +167,12 @@
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>汇总发布数量</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>生产资源</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="选择生产资源" style="border-radius: 50px;">
@@ -1037,6 +1043,7 @@
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织,
                                        "HmaterOutqty": data.出站数量,
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].出站关联数量 ? data.流转卡数量: result.data[1].出站关联数量): data.流转卡数量,
                                      
                                    });

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

@@ -173,6 +173,12 @@
                                                    <input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
                                                </td>
                                            </tr>
                                                 <tr>
                                                <th>汇总发布数量</th>
                                                <td class="bz_td">
                                                    <input type="text" name="Hzfbsl" class="layui-input" id="Hzfbsl" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>生产资源</th>
                                                <td class="bz_td">
@@ -762,6 +768,7 @@
                                        "HPRDOrg": data.组织名称,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID,
                                        "Hzfbsl": data.出站数量,
                                        "lngBillSubKey": data.hsubid,
                                        //"NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量),
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
@@ -1198,7 +1205,11 @@
                                $("#HmaterOutqty").css("background", "");
                            } else if (data.末道工序 == "是") {
                                FirstEndHProcNo = 2;
                            } else {
                                $("#HmaterOutqty").attr("readonly", true);
                                $("#HmaterOutqty").css("background", "#efefef4d");
                            }
                           
                            $("#HProcNo").attr("readonly", "readonly");
                            $("#HProcNo").css("background-color", "#efefef4d");
                            layer.close(index);

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

@@ -2448,6 +2448,7 @@
                            $("#HCusID").val(data.HCusID);
                            $("#HCusNames").val(data.客户);
                            $("#HColorRemark").val(data.染色要求);
                            //$("#HRemark3").val(data.底部备注);
                            $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                            $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:选中 false:不选中
                            form.render("checkbox");

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

@@ -1645,7 +1645,7 @@
                if (checkStatus.data.length > 0) {
                    for (var i = 0; i < data.length; i++) {
                        var HInterID = data[i].hmainid.toString();
                        var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.备注2,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID +")    order by cast(b.流水号 as int)";
                        var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID +")    order by cast(b.流水号 as int)";
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名

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

@@ -180,19 +180,19 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline" >
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">辅助单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>-->
                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">辅助单位</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                </button>
                            </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" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" >
                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel">
                                            </div>
                                        </div>
                                    </div>
@@ -220,6 +220,11 @@
                    <input type="text" hidden lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" /><!--计划完工日期-->
                    <input type="text" hidden lay-verify="HUnitID" name="HUnitID" id="HUnitID" /><!--计量单位-->
                    <input type="text" hidden lay-verify="HUnitNumber" name="HUnitNumber" id="HUnitNumber" /><!--计量单位代码-->
                    <input type="text" hidden lay-verify="HRemark3" name="HRemark3" id="HRemark3" /><!--底部备注-->
                    <input type="text" hidden lay-verify="HRemark2" name="HRemark2" id="HRemark2" /><!--白坯要求-->
                    <input type="text" hidden lay-verify="HColorRemark" name="HColorRemark" id="HColorRemark" /><!--染色要求-->
                    <input type="text" hidden lay-verify="HCusID" name="HCusID" id="HCusID" /><!--客户-->
                    <input type="text" hidden lay-verify="HEmpID" name="HEmpID" id="HEmpID" /><!--业务员-->
                </form>
            </div>
        </div>
@@ -364,7 +369,7 @@
            var dataNum = [];
            var HBillNo = $("#HBillNo").val();
            for (var i = 0; i < HProcessExchangeSum; i++) {
                dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
                dataNum.push({ "HBillNo": HBillNo + "-" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
            }
            option1.data = dataNum;
            table.render(option1);
@@ -715,6 +720,11 @@
                        $("#HUnitNumber").val(data1.data[0].计量单位代码);
                        $("#HWidth").val(data1.data[0].HWidth);
                        $("#HWeight").val(data1.data[0].HWeight);
                        $("#HRemark3").val(data1.data[0].底部备注);
                        $("#HRemark2").val(data1.data[0].表头备注);
                        $("#HColorRemark").val(data1.data[0].染色要求);
                        $("#HCusID").val(data1.data[0].HCusID);
                        $("#HEmpID").val(data1.data[0].HEmpID);
                        //$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
                        //$("#HAuxUnit").val(data1.data[0].HAuxUnit);
                       // $("#HMaterModel").val(data1.data[0].HMaterModel);
@@ -775,7 +785,7 @@
                type: "get",
                url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
                async: true,
                data: { "sWhere": " and å•æ®å·='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
                data: { "sWhere": " and å•æ®å·='" + HBillNo + "' and å·¥åºä»£ç  !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
                success: function (result) {
                    var data = result.data;
                    var Tablerow = [];