#

18516761980

2021-12-27 55b36b1279fd11feafde05a65ec835f55aa89850

 src/main/java/com/slcf/controller/AsrsController.java

@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.slcf.pojo.*;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -26,11 +27,6 @@
import org.springframework.web.bind.annotation.ResponseBody;

import com.slcf.erp.ErpBean;
import com.slcf.pojo.LocDetailBean;
import com.slcf.pojo.LocationBean;
import com.slcf.pojo.WaitCheckBean;
import com.slcf.pojo.WaitPakInBean;
import com.slcf.pojo.WaitPakOutBean;
import com.slcf.service.LocDetailService;
import com.slcf.service.LocationService;
import com.slcf.service.WaitCheckService;
@@ -676,7 +672,8 @@
               
               String loc_no=job.get("lgpla").toString();
               LocationBean locBean = locationService.queryLocationById(loc_no);
               if(locBean==null || !locBean.getLoc_sts().equals("F")) {
               WaitCheckBean waitCheckBean = waitCheckService.getWaitCheckByLoc(loc_no);
               if(locBean==null || (!locBean.getLoc_sts().equals("F") && null == waitCheckBean)) {
                  jsonRet.put("lgnum", job.get("lgnum").toString());
                  jsonRet.put("ivnum", job.get("ivnum").toString());
                  jsonRet.put("ivpos", job.get("ivpos").toString());
@@ -709,7 +706,9 @@
               waitCheck.setLgtyp(job.get("lgtyp").toString());
               waitCheck.setLgpla(job.get("lgpla").toString());

               int result = waitCheckService.insertWaitCheck(waitCheck);
//               if(null == waitCheckBean) {
                  int result = waitCheckService.insertWaitCheck(waitCheck);
//               }
               
               jsonRet.put("lgnum", job.get("lgnum").toString());
               jsonRet.put("ivnum", job.get("ivnum").toString());