订单出库显示明细是否完成修复

Administrator

14 小时以前 936eec28271690fe40fd85cba87bcd8274bb11b3

订单出库显示明细是否完成修复

 src/main/java/com/zy/common/properties/SystemProperties.java

@@ -63,7 +63,7 @@

    // 生成激活码
    public static void main(String[] args) {
        String timeStr = "2025-09-26 08:00:00";
        String timeStr = "2099-09-26 08:00:00";
        Date exprTime = DateUtils.convert(timeStr);
        String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
        System.out.println("激活码："+code);

 src/main/java/com/zy/common/service/CommonService.java

@@ -175,11 +175,14 @@
                .gt("bay1",columnNum));

        // 深库位没有则搜索浅库位
        if (locMasts.isEmpty()) {
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//        if (locMasts.isEmpty()) {
            List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts","O").in("crn_no",crnNoList).in("row1","2,3,6,7,10,11,14,15,18,19,22,23").orderBy("lev1,bay1,row1")
                    .gt("bay1",columnNum));
        }
            if(!locMasts2.isEmpty()) {
                locMasts.addAll(locMasts2);
            }
//        }
        if (locMasts.isEmpty()) {
            throw new CoolException("没有可用库位");
        }

 src/main/resources/license.lic

Binary files differ

 src/main/webapp/views/order/outMes.html

@@ -78,9 +78,9 @@
                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
                                    <i class="layui-icon">&#xe666;</i>重置
                                </button>
<!--                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
<!--                                    <i class="layui-icon">&#xe666;</i>重置-->
<!--                                </button>-->
                            </div>
                        </div>
                    </form>

 src/main/webapp/views/order/outReturn.html

@@ -78,9 +78,9 @@
                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
                                    <i class="layui-icon">&#xe666;</i>重置
                                </button>
<!--                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
<!--                                    <i class="layui-icon">&#xe666;</i>重置-->
<!--                                </button>-->
                            </div>
                        </div>
                    </form>

 src/main/webapp/views/order/outUQ.html

@@ -78,9 +78,9 @@
                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
                                    <i class="layui-icon">&#xe666;</i>重置
                                </button>
<!--                                <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
<!--                                    <i class="layui-icon">&#xe666;</i>重置-->
<!--                                </button>-->
                            </div>
                        </div>
                    </form>