#

ytfl

7 天以前 f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -292,18 +292,36 @@
    public R pdaSearchBack(@RequestParam String matnr) {
        EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
        wrapper.like("VBATCHCODE", matnr);
        NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
        if (null == nccXsckmxTkWms) {
        List<NccXsckmxTkWms> nccXsckmxTkWmsList = nccXsckmxTkWmsService.selectList(wrapper);
        if (nccXsckmxTkWmsList.isEmpty()) {
            return R.error("未找到此条码");
        }
        Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
        MatParam matParam = new MatParam();
        Synchro.Copy(mat, matParam);
        matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
        matParam.setAnfme(0.0D);
        matParam.setAnfme2(0.0D);
        matParam.setTiaoma(matnr);
        return R.ok().add(matParam);

        List<String> orderNos = new ArrayList<>();
        List<HashMap<String, Object>> list = new ArrayList<>();
        for (NccXsckmxTkWms nccXsckmxTkWms : nccXsckmxTkWmsList) {
            if (orderNos.contains(nccXsckmxTkWms.getVsourcebillcode())) {
                continue;
            }
            orderNos.add(nccXsckmxTkWms.getVsourcebillcode());
            HashMap<String, Object> map = new HashMap<>();

            Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
            if (mat == null) {
                continue;
            }
            MatParam matParam = new MatParam();
            Synchro.Copy(mat, matParam);
            matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
            matParam.setAnfme(0.0D);
            matParam.setAnfme2(0.0D);
            matParam.setTiaoma(matnr);

            map.put("orderNo", nccXsckmxTkWms.getVsourcebillcode());
            map.put("matData", matParam);
            list.add(map);
        }
        return R.ok().add(list);
    }

    @RequestMapping("/comb/auth")