问题修改

王 垚

2023-01-04 5faab615c58b52dec282b6ea5db12830ffa33894

问题修改

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -402,6 +402,10 @@
                        layer.msg("明细记录第" + (i + 1) + "行,本次生成条码数量不能超出未生成条码数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HBatchNo == "" || _sSubStr[i].HKFDate == "")) {
                        layer.msg("明细记录第" + (i + 1) + "行,批次或生产日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                }
                layer.load(3)
                $.ajax(

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -67,12 +67,19 @@
                                            <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                    <div class="layui-colla-content" style="padding-left:82px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料编码</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">旧物料编码</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料名称</label>
                                            <div class="layui-input-block">
@@ -418,8 +425,10 @@
                    sqlWhere += " and 源单单号 like ^^%" + $("#HBillNoFrom").val() + "%^^";
                if ($("#HInnerBillNo").val() != "")
                    sqlWhere += " and 送货单号 like ^^%" + $("#HInnerBillNo").val() + "%^^";
                //if ($("#HShortNumber").val() != "")
                //    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HOldMaterNumber").val() != "")
                    sqlWhere += " and 旧物料编码 like ^^%" + $("#HOldMaterNumber").val() + "%^^";
                if ($("#HMaterNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HMaterNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html

@@ -109,8 +109,16 @@
                                                        <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> 物流单号：</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
                                               
                                        </div>
                                            
                                    </div>
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item">
@@ -271,7 +279,7 @@
                    , { field: 'HQty', title: '送货数量', width: 100, edit: 'text' , event: "inputHQty"}
                    , { field: 'HRQty', title: '未入库数量', width: 100 }
                    , { field: 'HSQty', title: '源单数量', width: 100 }
                     , { field: 'HBatchNo', title: '批次', width: 120}
                    , { field: 'HBatchNo', title: '批次', width: 120,edit: 'text',}
                    , { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
                    , { field: 'HKFPeriod', title: '保质期', width: 100 }
                    , { field: 'HDate', title: '预计到货日期', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
@@ -658,6 +666,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,送货单数量不能超过已生成条码数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HBatchNo == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,批次为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
                }
                else {

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -31,17 +31,7 @@
                                            <span>更多</span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">订单状态</label>
                                        <div class="layui-input-block">
                                            <select name="HStatus" id="HStatus" lay-filter="">
                                                <option value="" selected="">全部</option>
                                                <option value="未确认">未确认</option>
                                                <option value="已确认">已确认</option>
                                                <option value="已驳回">已驳回</option>
                                            </select>
                                        </div>
                                    </div>
                                  
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
@@ -52,6 +42,12 @@
                                        <label class="layui-form-label">物料编码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">旧物料编码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -134,7 +130,27 @@
                                                </select>
                                            </div>
                                        </div>

                                        <div class="layui-inline">
                                            <label class="layui-form-label">订单状态</label>
                                            <div class="layui-input-block">
                                                <select name="HStatus" id="HStatus" lay-filter="">
                                                    <option value="" selected="">全部</option>
                                                    <option value="未确认">未确认</option>
                                                    <option value="已确认">已确认</option>
                                                    <option value="已驳回">已驳回</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">完成状态</label>
                                            <div class="layui-input-block">
                                                <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
                                                    <option value="">全部</option>
                                                    <option value="未完成" selected="">未完成</option>
                                                    <option value="已完成">已完成</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -471,12 +487,16 @@
            //查询条件
            function get_FastQuery(table, option) {
                var sqlWhere = "";
                if ($("#HFinishStatus").val() != "")
                    sqlWhere += " and 完成状态 like ^^%" + $("#HFinishStatus").val() + "%^^";
                if ($("#HStatus").val() != "")
                    sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
                if ($("#HBillNo").val() != "")
                    sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
                if ($("#HShortNumber").val() != "")
                    sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
                if ($("#HOldMaterNumber").val() != "")
                    sqlWhere += " and 旧物料编码 like ^^%" + $("#HOldMaterNumber").val() + "%^^";
                if ($("#HNumber").val() != "")
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")