From e5130fb7e945c795898d36aa323125996c5af79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 12 Jun 2024 14:08:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=8E=92=E4=BA=A7=E4=BA=A7?= =?UTF-8?q?=E8=83=BD=202.=E4=B8=B4=E6=97=B6=E5=8F=96=E6=B6=88=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=A0=A1=E9=AA=8Cmac=203.=E4=B8=89=E6=9C=88=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=8E=92=E4=BA=A7=E7=BB=93=E6=9E=9C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jhgk/DmSygdMxController.java | 4 ++-- src/main/java/com/dsic/gj_erp/pc/Constant.java | 8 ++++---- .../com/dsic/gj_erp/service/ApiService.java | 18 +++++++++--------- .../gj_erp/service/jhgk/DmSygdMxService.java | 2 +- .../service/jhgk/impl/DmSygdMxServiceImpl.java | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java index 9563ee5..a0d67e4 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java @@ -137,8 +137,8 @@ public class DmSygdMxController { @RequestMapping("/tqSygd") @AuthFunction - public ResultBean tqSygd(@RequestBody List list){ - return service.tqSygd(); + public ResultBean tqSygd(String from, String to){ + return service.tqSygd(from,to); } } diff --git a/src/main/java/com/dsic/gj_erp/pc/Constant.java b/src/main/java/com/dsic/gj_erp/pc/Constant.java index 4b85413..4c35649 100644 --- a/src/main/java/com/dsic/gj_erp/pc/Constant.java +++ b/src/main/java/com/dsic/gj_erp/pc/Constant.java @@ -29,10 +29,10 @@ public interface Constant { @Getter @AllArgsConstructor enum 设备产能{ - 上料01(工序.上料,"上料01","",0,0,500.0,400.0,400), - 抛丸01(工序.抛丸,"抛丸01","",0,0,480.0,286.0,526.0), - 理料01(工序.理料,"理料01","",0,0,480.0,286.0,526.0), - 划线01(工序.划线,"划线01","",0,0,480.0,286.0,526.0), + 上料01(工序.上料,"上料01","",0,0,400.0,400.0,400), + 抛丸01(工序.抛丸,"抛丸01","",0,0,400.0,286.0,526.0), + 理料01(工序.理料,"理料01","",0,0,400.0,286.0,526.0), + 划线01(工序.划线,"划线01","",0,0,400.0,286.0,526.0), 龙门01(工序.切割,"龙门01","",2.4,3.6,40,15.6,25.2), 火焰01(工序.切割,"火焰01","",0.3,11.15,40.0,0,2.0), diff --git a/src/main/java/com/dsic/gj_erp/service/ApiService.java b/src/main/java/com/dsic/gj_erp/service/ApiService.java index 0625c53..5281cab 100644 --- a/src/main/java/com/dsic/gj_erp/service/ApiService.java +++ b/src/main/java/com/dsic/gj_erp/service/ApiService.java @@ -58,7 +58,7 @@ public class ApiService { String pwd=""; String ip= IPUtils.getIpAddr(request); log.info("账号:{},登录IP:{}",loginBean.getYhdm(),ip); - String macAddress=IPUtils.getMACAddress(ip); + //String macAddress=IPUtils.getMACAddress(ip); if (!StringUtils.isEmpty(loginBean.getPwd())){ pwd= MD5Util.encrypt(loginBean.getPwd()); @@ -74,14 +74,14 @@ public class ApiService { if (!syuserp.getIpAddress().equals(ip) ) { throw new CustomException(10201, "登陆失败，IP地址未授权！"); } - if (StrUtil.isNotEmpty(syuserp.getMacAddress())&& !syuserp.getMacAddress().equals(macAddress)) { - throw new CustomException(10201, "登陆失败，mac地址错误！"); - } - - if (StrUtil.isEmpty(syuserp.getMacAddress())){ - syuserp.setMacAddress(macAddress); - syuserMapper.updateUserMac(syuserp); - } +// if (StrUtil.isNotEmpty(syuserp.getMacAddress())&& !syuserp.getMacAddress().equals(macAddress)) { +// throw new CustomException(10201, "登陆失败，mac地址错误！"); +// } + +// if (StrUtil.isEmpty(syuserp.getMacAddress())){ +// syuserp.setMacAddress(macAddress); +// syuserMapper.updateUserMac(syuserp); +// } syuserp.setPWD(null); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java index d72e6b0..e2ab9c6 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java @@ -28,7 +28,7 @@ public interface DmSygdMxService extends IService { List getPl(String begin,String end); List getTZList(List list); List getDhList(List list); - ResultBean tqSygd(); + ResultBean tqSygd(String from, String to); List tqSygd1(String begin, String end); Object cgjhdhqk(Map map); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 16cfeb6..ee619e1 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -723,12 +723,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl i * @return */ @Transactional - public ResultBean tqSygd() { + public ResultBean tqSygd(String begin, String end) { //1.查询未来3个月明细信息 //测试 // List list=null; - String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01"); - String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd"); +// String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01"); +// String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd"); List list = this.list(new QueryWrapper() .between("jssj",