#

zjj

2023-09-07 79a9b832b65cedf2602fe4a620f8d81c3aa14118

#

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -206,8 +206,7 @@
                    throw new CoolException("修改单据作业数量失败");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
                detlDto.setPayment(orderDetl.getPayment());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;

 src/main/webapp/static/js/order/order.js

@@ -588,8 +588,7 @@
        layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
            layer.closeAll();
            layer.load(1, {shade: [0.1,'#fff']});
            // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
            location.href = "http://10.114.97.100:8080/stwms/order/printExport/auth?orderNo="+data.orderNo;
            location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
            layer.closeAll('loading');
        });
    }

 src/main/webapp/static/js/orderLog/orderLog.js

@@ -555,7 +555,7 @@
            layer.closeAll();
            layer.load(1, {shade: [0.1,'#fff']});
            // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
            location.href = "http://10.114.97.100:8080/stwms/orderLog/printExport/auth?orderNo="+data.orderNo;
            location.href = baseUrl+"/orderLog/printExport/auth?orderNo="+data.orderNo;
            layer.closeAll('loading');
        });
    }

 src/main/webapp/views/login.html

@@ -121,13 +121,14 @@
        if (password === "") {
          layer.tips('请输入密码', '#password', {tips: [4, '#ff0000']});
          return;
        }else {
          if(!checkPassword(password)){
            //密码必须包含字符和数字
            layer.tips('密码必须包含字符和数字长度不能少于8位，且不能包含连续数字和四位重复数字', '#password', {tips: [4, '#ff0000']});
            return ;
          }
        }
        // else {
        //   if(!checkPassword(password)){
        //     //密码必须包含字符和数字
        //     layer.tips('密码必须包含字符和数字长度不能少于8位，且不能包含连续数字和四位重复数字', '#password', {tips: [4, '#ff0000']});
        //     return ;
        //   }
        // }
        $.ajax({
          url: baseUrl+"/login.action",
          data: {