#

18516761980

2022-07-20 6353a0d97a272b683663ecb4d46ecdff250ba525

#

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

@@ -17,6 +17,7 @@
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;
@@ -27,11 +28,6 @@
import org.springframework.web.bind.annotation.ResponseBody;

import com.slcf.erp.ErpBean;
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;
@@ -51,6 +47,10 @@
    LocationService locationService;
    @Autowired
    LocDetailService locDetailService;
    @Autowired
    MatCodeService matCodeService;
    @Autowired
    WorkFileService workFileService;
    
    Logger logger=Logger.getLogger(AsrsController.class);
    
@@ -791,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接口上传完成信息
     */

 src/main/java/com/slcf/dao/WorkFileDao.java

@@ -148,4 +148,11 @@
    @Update("update asr_wrk_detl set nista=#{nista} "
            + " where wrk_no=#{wrk_no} and lgnum=#{lgnum} and tbnum=#{tbnum} and tbpos=#{tbpos} and matnr=#{matnr}")
    public int upWorkDetl(WorkDetailBean workDetl);

    /**
     * 根据托盘码查询工作明细List
     * @return
     */
    @Select("select * from asr_wrk_detl where zpallet=#{} order by wrk_no asc")
    public List<WorkDetailBean> getWorkDetlList(String zpallet);
}

 src/main/java/com/slcf/service/WorkFileService.java

@@ -72,4 +72,6 @@
     * @return
     */
    public int upWorkDetl(WorkDetailBean workDetl);

    public List<WorkDetailBean> getWorkDetlList(String zpallet);
}

 src/main/java/com/slcf/service/impl/WorkFileServiceImpl.java

@@ -347,4 +347,17 @@
        }
        return result;
    }

    /**
     * 根据托盘码查询工作明细List
     * @return
     */
    public List<WorkDetailBean> getWorkDetlList(String zpallet) {
        try {
            return workFileDao.getWorkDetlList(zpallet);
        }catch(Exception e) {
            System.out.println(e.getMessage());
            return null;
        }
    }
}