#

18516761980

2022-07-25 2c37b04bc0e5e2eae772166f514ff67113668f17

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

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

import com.slcf.pojo.*;
import com.slcf.service.*;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -26,16 +28,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;
import com.slcf.service.WaitPakInService;
import com.slcf.service.WaitPakOutService;

import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -55,6 +47,10 @@
   LocationService locationService;
   @Autowired
   LocDetailService locDetailService;
   @Autowired
   MatCodeService matCodeService;
   @Autowired
   WorkFileService workFileService;
   
   Logger logger=Logger.getLogger(AsrsController.class);
   
@@ -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,12 @@
               waitCheck.setLgtyp(job.get("lgtyp").toString());
               waitCheck.setLgpla(job.get("lgpla").toString());

               int result = waitCheckService.insertWaitCheck(waitCheck);
               if(job.has("bname")) {
                  waitCheck.setModi_user(job.get("bname").toString());
               }
//               if(null == waitCheckBean) {
                  int result = waitCheckService.insertWaitCheck(waitCheck);
//               }
               
               jsonRet.put("lgnum", job.get("lgnum").toString());
               jsonRet.put("ivnum", job.get("ivnum").toString());
@@ -789,7 +791,70 @@
      }
      return map;
   }
	

   /**
    * 库位信息返回接口
    * @param requestBody
    * @param request
    * @return
    */
   @ResponseBody
   @RequestMapping(value="/queryWrkDetl.action",method={ RequestMethod.GET, RequestMethod.POST })
   public JSONObject queryWrkDetl(@RequestBody String requestBody,HttpServletRequest request){

      JSONObject map = new JSONObject();
      logger.info("工作明细返回接口调用：" + requestBody);
      try {
         JSONArray result = new JSONArray();
         JSONObject json = JSONObject.fromObject(requestBody);
         String zpallet = json.get("zpallet").toString();

         List<WorkDetailBean> detls = workFileService.getWorkDetlList(zpallet);
         for (WorkDetailBean detl : detls) {
            WaitPakOutBean wrapper = new WaitPakOutBean();
            wrapper.setLgnum(detl.getLgnum());
            wrapper.setTanum(detl.getTbnum());
            wrapper.setTapos(detl.getTbpos());
            WaitPakOutBean waitPakout = waitPakOutService.queryWaitPakOutByNum(wrapper);

            JSONObject detlJSON = new JSONObject();
            detlJSON.put("LGNUM", detl.getLgnum());
            detlJSON.put("TANUM", detl.getTbnum());
            detlJSON.put("BDATU", detl.getModi_time());
            detlJSON.put("BZEIT", detl.getModi_time());
            detlJSON.put("TRART", "");
            detlJSON.put("TAPOS", detl.getTbpos());
            detlJSON.put("MATNR", detl.getMatnr());
            detlJSON.put("MAKTX", detl.getMaktx());
            detlJSON.put("WERKS", detl.getWerks());
            detlJSON.put("LGORT", "");
            detlJSON.put("MEINS", detl.getAltme());
            detlJSON.put("VLTYP", waitPakout == null ? "" : waitPakout.getVltyp().toString());
            detlJSON.put("NLTYP", waitPakout == null ? "" : waitPakout.getNltyp());
            detlJSON.put("NLBER", "");
            detlJSON.put("NLPLA", waitPakout == null ? "" : waitPakout.getNlpla());
            detlJSON.put("VSOLM", detl.getAnfme());
            detlJSON.put("BNAME", detl.getBname().toString());
            result.add(detlJSON);
         }
         if (result.size() == 0){
            map.put("item", result);
            map.put("zstatus", "E");
            map.put("message", "查询不到该托盘码的工作明细");
         }else {
            map.put("item", result);
            map.put("zstatus", "S");
            map.put("message", "返回明细信息成功");
         }

      }catch (Exception e){
         map.put("item", "");
         map.put("zstatus", "E");
         map.put("message", "返回明细信息失败" + e.getMessage());
      }
      return map;
   }

   /**
    * 入库完成，调用sap接口上传完成信息
    */