修改问题

IPC-610

2025-01-02 9d7dda331f3498a95e2e922e9ddae0fa43e83605

修改问题

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -911,6 +911,7 @@
                var data = obj.data;
                var lotno = data.LotNo;
                
				
                var id = data.Id;
                switch(obj.event)
                {
@@ -962,7 +963,8 @@
                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
                                    +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
                                    +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
                                    +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot +"&Lotno="+lotno;
                                    console.log("field.lotno:"+lotno);
                                    
                                    layer.open({
                                        type: 2,

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -177,6 +177,7 @@
                { field: 'PackagNo', title: '包装名称', width: 160, templet: "#table-content-Packlist" },
                { field: 'Lot1', title: '生产日期', align: 'center', edit: 'text', width: 140 },
                { field: 'Lot2', title: '过期日期', align: 'center', edit: 'text', width: 140 },
                { field: 'IsBale', title: '是否裹包', align: 'center', edit: 'text', width: 140 },

                // { field: 'Price', title: '单价', align: 'center', width: 80 },
                // { field: 'Money', title: '金额', align: 'center', width: 100 },

 HTML/views/ASNSetting/LabelBox.html

@@ -460,6 +460,7 @@
                { field: 'SkuNo', title: '物料编码', align: 'center', fixed: 'left', width: 140, "disabled": true },
                { field: 'SkuName', title: '物料名称', align: 'center', width: 240, },
                { field: 'Qty', title: '数量', align: 'center', width: 100, },
                { field: 'UnitName', title: '单位', align: 'center', width: 100, },
                { field: 'FullQty', title: '整箱数量', align: 'center', width: 100, },
                { field: 'LotNo', title: '进厂编号', align: 'center', width: 155, },
                { field: 'LotText', title: '批次描述', align: 'center', width: 165 },
@@ -528,6 +529,8 @@
                        limits: pageLimits,
                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                        done: function (res) {
							
                            console.log(res);
                            setRight();
                            //自定义列宽
                            SetTableColW('Box-list', 'BllAsn/GetLabelBoxList', TotalColsSysArr);

 HTML/views/ASNSetting/LabelBoxBuDa.html

@@ -248,7 +248,7 @@
                            //$("#Standard" + z.toString()).html(res.data[z].Standard);

                            $("#Qty").attr("id", "Qty" + z.toString());
                            $("#Qty" + z.toString()).html( res.data[z].Qty);
                            $("#Qty" + z.toString()).html( res.data[z].Qty+res.data[z].unit);

                            $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
                            $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);

 HTML/views/ASNSetting/LabelPrint.html

@@ -32,10 +32,10 @@
                <button id="btnAdd" class="layui-btn layui-btn-sm" lay-event="Add2"><i
                        class="layui-icon">&#xe654;</i>生成标签</button>
            </div> 
            <div class="layui-inline">
            <!-- <div class="layui-inline">
                <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
                        class="layui-icon">&#xe654;</i>打印</button>
            </div> 
            </div>  -->
        </div>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="print"
            style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
@@ -64,7 +64,7 @@
                    </tr>
                    <tr>
                        <td>进厂编号</td>
                        <td style="padding: 1px 0px;"></td>
                        <td id="Lotno"> </td>
                        <td>物料代码</td>
                        <td id="SkuNo"> </td>
                    </tr>
@@ -122,6 +122,9 @@
            var supplierLot=getQueryString('SupplierLot'); //原厂批号
            $("#SupplierLot").html(supplierLot);
            console.log(supplierLot);

            var Lotno=getQueryString('Lotno'); //原厂批号
            $("#Lotno").html(Lotno);
            var doing = true;
            // console.log(productionTime);
            // console.log(expirationTime);
@@ -229,7 +232,7 @@
                            $("input[name='SupplierName']").val(res.data[0].SupplierName);
                            $("input[name='ProductionDate']").val(res.data[0].ProductionDate);
                            $("input[name='SapSkuNo']").val(res.data[0].SapSkuNo);
                            $("input[name='Qty']").val(res.data[0].Qty);
                            $("input[name='Qty']").val(res.data[0].Qty+res.data[0]);
                            $("input[name='Standard']").val(res.data[0].Standard);
                            $("input[name='SupplierLot']").val(res.data[0].SupplierLot);
                            $("input[name='LotNo']").val(res.data[0].LotNo);

 HTML/views/BaseSetting/Materials.html

@@ -61,7 +61,7 @@
                        <div class="layui-input-inline">
                            <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">原料</option>
                                <option value="0">原辅料</option>
                                <option value="1">包材</option>
                                <option value="2">成品</option>
                                <option value="3">耗材</option>
@@ -177,6 +177,15 @@
                        {{# }  }}
                    </script>

                <!-- 是否免检 -->
                <script type="text/html" id="buttonIsWrap">
                    {{# if(d.IsInspect=='0'){ }}
                        <p>否</p>
                    {{# } else if(d.IsInspect=='1') { }}
                        <p>是</p>
                    {{# }  }}
                </script>

                <!-- 存储环境 -->
                <script type="text/html" id="buttonEnvironment">
                        {{# if(d.Environment=='0'){ }}

 HTML/views/SOSetting/ExportNotice.html

@@ -155,7 +155,6 @@
                                        <option value="1">1</option>
                                        <option value="2">2</option>
                                        <option value="3">3</option>
                                        <option value="4">4</option>
                                    </select>
                                </div>
                            </div>                            
@@ -169,6 +168,8 @@
                                        <option value="044">044</option>
                                        <option value="051">051</option>
                                        <option value="059">059</option>
                                        <option value="440">440</option>
                                        <option value="443">443</option>
                                    </select>
                                </div>
                            </div>

 HTML/views/WareHouseSetting/Area.html

@@ -48,6 +48,7 @@
                                    <option value="3">包材区</option>
                                    <option value="4">空托区</option>
                                    <option value="5">耗材区</option>
                                    <option value="6">中间品区</option>
                                </select>
                            </div>
                        </div>

 HTML/views/WareHouseSetting/AreaAddFrom.html

@@ -62,6 +62,7 @@
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>
                        <option value="6">中间品区</option>
                    </select>
                </div>
            </div>

 HTML/views/WareHouseSetting/AreaFrom.html

@@ -38,6 +38,7 @@
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>
                        <option value="6">中间品区</option>
                    </select>
                </div>
            </div>

 HTML/views/WareHouseSetting/Locate.html

@@ -518,7 +518,8 @@
                                        Id: id,
                                        Status:field.Status,
                                        Flag:field.Flag,
                                        Temperature:field.Temp
                                        Temperature:field.Temp,
                                        Area:field.AreaNo
                                    };
                                    sendData(IP + "/Sys/EditStorageLocat", param, 'post', function(res) {
                                        console.log(res);

 HTML/views/WareHouseSetting/LocateEditArea.html

@@ -32,19 +32,19 @@
            <div class="layui-form-item">
                <label class="layui-form-label">&emsp;&emsp;储排</label>
                <div class="layui-input-inline">
                    <input type="number" id="Row" name="Row" placeholder="排···" autocomplete="off"
                    <input type="number" lay-verify="required|PRules" id="Row" name="Row" placeholder="排···" autocomplete="off"
                        class="layui-input" >
                </div>
                <label class="layui-form-label">&emsp;&emsp;储列</label>
                <div class="layui-input-inline">
                    <input type="number" id="Column" name="Column" placeholder="列···" autocomplete="off"
                    <input type="number" lay-verify="required|LRules" id="Column" name="Column" placeholder="列···" autocomplete="off"
                        class="layui-input" >
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">&emsp;&emsp;储层</label>
                <div class="layui-input-inline">
                    <input type="number" id="Layer" name="Layer" placeholder="层···" autocomplete="off"
                    <input type="number" lay-verify="required|CRules" id="Layer" name="Layer" placeholder="层···" autocomplete="off"
                        class="layui-input" >
                </div>
                <label class="layui-form-label">储位深度</label>
@@ -110,6 +110,26 @@
                GetRoadway("");
                 
                GetArea('');
				
                  //自定义验证规则
                  form.verify({
                    PRules: function(value, item){
                        var pattern = /^[a-zA-Z0-9_]+$/; // 这里写你的正则表达式
                        if(!pattern.test(value)){
                                              return '用户名只能包含字母、数字和下划线';
                      }
                    },LRules: function(value, item){
                        var pattern = /^[a-zA-Z0-9_]+$/; // 这里写你的正则表达式
                        if(!pattern.test(value)){
                                             return '用户名只能包含字母、数字和下划线';
                        }
                    },CRules: function(value, item){
                        var pattern = /^[a-zA-Z0-9_]+$/; // 这里写你的正则表达式
                        if(!pattern.test(value)){
                                              return '用户名只能包含字母、数字和下划线';
                        }
                    }
                  });
                 
                //获取区域
                function GetArea(val){ 

 HTML/views/WareHouseSetting/Roadway.html

@@ -48,6 +48,7 @@
                                    <option value="3">包材区</option>
                                    <option value="4">空托区</option>
                                    <option value="5">耗材区</option>
                                    <option value="6">中间品区</option>
                                </select>
                            </div>
                        </div>

 HTML/views/WareHouseSetting/RoadwayFrom.html

@@ -38,6 +38,7 @@
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>
                        <option value="6">中间品区</option>

                    </select>
                </div>