Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yxj

2025-01-03 30a3bd621ecb96b109bc5a743f2acfdd89a8c75c

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -67,6 +67,7 @@
                                                <label class="layui-form-label">工厂代码</label>
                                                <div class="layui-input-inline">
                                                    <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
                                                        <!--<option value="0">舜成</option>-->
                                                    </select>
                                                </div>
                                            </div>
@@ -85,13 +86,14 @@
                                                        <option value="1">生产订单</option>
                                                        <option value="2">生产汇报单</option>
                                                        <option value="3">采购订单</option>
                                                        <option value="4">收料通知单</option>
                                                        <!--<option value="4">收料通知单</option>
                                                        <option value="5">委外订单</option>
                                                        <option value="6">生产入库单</option>
                                                        <option value="7">采购入库单</option>
                                                        <option value="8">销售退货单</option>
                                                        <option value="9">生产退料单</option>
                                                        <option value="10">工序流转卡</option>
                                                        <option value="10">工序流转卡</option>-->
                                                        <option value="11">销售出库单</option>
                                                    </select>
                                                </div>
                                            </div>
@@ -108,6 +110,7 @@
                                                <label class="layui-form-label">条码类型</label>
                                                <div class="layui-input-inline">
                                                    <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
                                                        <!--<option value="11">唯一条码</option>-->
                                                    </select>
                                                </div>
                                            </div>
@@ -475,6 +478,9 @@
                    case '10':
                        return "工序流转卡";
                        break;
                    case '11':
                        return '销售出库单';
                        break;
                }
            }

@@ -599,13 +605,13 @@
                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//生成按钮禁用
                for (var i = 0; i < table.cache['mainTable'].length; i++) {
                    table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
                    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
                    if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
                    if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if ("HPinfan" in table.cache["mainTable"][i]) {
                    if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
                        if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
                            table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "”").replaceAll(";", "；")
                        }