1.调整排产产能

2.临时取消登录校验mac
3.三月滚动排产结果提交增加日期参数传递

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<DmSygdMx> list){
+    public ResultBean tqSygd(String from, String to){
-        return service.tqSygd();
+        return service.tqSygd(from,to);
     }
 
 }

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,400.0,400.0,400),
-        抛丸01(工序.抛丸,"抛丸01","",0,0,480.0,286.0,526.0),
+        抛丸01(工序.抛丸,"抛丸01","",0,0,400.0,286.0,526.0),
-        理料01(工序.理料,"理料01","",0,0,480.0,286.0,526.0),
+        理料01(工序.理料,"理料01","",0,0,400.0,286.0,526.0),
-        划线01(工序.划线,"划线01","",0,0,480.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),

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)) {
+//        if (StrUtil.isNotEmpty(syuserp.getMacAddress())&& !syuserp.getMacAddress().equals(macAddress)) {
-            throw new CustomException(10201, "登陆失败，mac地址错误！");
+//            throw new CustomException(10201, "登陆失败，mac地址错误！");
-        }
+//        }
-
+
-        if (StrUtil.isEmpty(syuserp.getMacAddress())){
+//        if (StrUtil.isEmpty(syuserp.getMacAddress())){
-            syuserp.setMacAddress(macAddress);
+//            syuserp.setMacAddress(macAddress);
-            syuserMapper.updateUserMac(syuserp);
+//            syuserMapper.updateUserMac(syuserp);
-        }
+//        }
 
         syuserp.setPWD(null);
 

src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java

@@ -28,7 +28,7 @@ public interface DmSygdMxService extends IService<DmSygdMx> {
      List<Pldto> getPl(String begin,String end);
      List<Tzjhdto> getTZList(List<DmSygdMx> list);
      List<Dhdto> getDhList(List<DmSygdMx> list);
-     ResultBean tqSygd();
+     ResultBean tqSygd(String from, String to);
      List<DmYdjhxf> tqSygd1(String begin, String end);
 
      Object cgjhdhqk(Map<String,Object> map);

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -723,12 +723,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
      * @return
      */
     @Transactional
-    public ResultBean tqSygd() {
+    public ResultBean tqSygd(String begin, String end) {
         //1.查询未来3个月明细信息
         //测试
 //        List<DmSygdMx> list=null;
-        String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01");
+//        String begin = DateUtil.format(DateUtil.nextMonth(), "yyyy/MM/01");
-        String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd");
+//        String end = DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), 3)), "yyyy/MM/dd");
 
         List<DmSygdMx> list = this.list(new QueryWrapper<DmSygdMx>()
                 .between("jssj",