diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java index df2c704..6a1d12e 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java @@ -231,7 +231,7 @@ public class DumpServiceImpl implements DumpService { currentRollSap.put("nums", nums); } // 修改卷的状态 - rollDao.updateRollStatus(rollNo,"X","已扫描"); + // rollDao.updateRollStatus(rollNo,"X","已扫描"); responseData.setCode("0"); }else{ responseData.setCode("1"); @@ -312,7 +312,7 @@ public class DumpServiceImpl implements DumpService { dumpToSap.remove(site+"-"+partNo); } // 修改卷的状态 - rollDao.updateRollStatus(rollNo,"I","已入库"); + // rollDao.updateRollStatus(rollNo,"I","已入库"); responseData.setCode("0"); return responseData; } @@ -561,9 +561,9 @@ public class DumpServiceImpl implements DumpService { if(null!=dumpRollNos){ session.removeAttribute("dumpRollNos"); // 还原扫描卷的状态 - for (String key:dumpRollNos.keySet()){ - rollDao.updateRollStatus(key,"I","已入库"); - } +// for (String key:dumpRollNos.keySet()){ +// rollDao.updateRollStatus(key,"I","已入库"); +// } } //7.移除卷号统计map Map dumpRollCounts = (Map) session.getAttribute("dumpRollCounts"); diff --git a/src/test/java/com/gaotao/service/DateTimeTest.java b/src/test/java/com/gaotao/service/DateTimeTest.java index 68674dc..5e3d795 100644 --- a/src/test/java/com/gaotao/service/DateTimeTest.java +++ b/src/test/java/com/gaotao/service/DateTimeTest.java @@ -1,11 +1,20 @@ package com.gaotao.service; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RuntimeUtil; +import cn.hutool.extra.mail.MailAccount; +import cn.hutool.extra.mail.MailUtil; +import cn.hutool.system.HostInfo; +import cn.hutool.system.SystemUtil; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.util.Date; import java.util.List; /** @@ -20,6 +29,14 @@ import java.util.List; public class DateTimeTest { - + public static void main(String[] args) { + Date dateTime = DateUtil.endOfDay(new Date()); + System.out.println(dateTime); + } + @Test + public void t1(){ + HostInfo hostInfo = SystemUtil.getHostInfo(); + System.out.println(hostInfo); + } }