#

Junjie

6 天以前 39bdfc374dcb4725c432106e97df9f77dd82e58a

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

@@ -19,9 +19,7 @@
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import com.zy.nc.service.NccXsckmxTkWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -61,6 +59,8 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WrkMastLogService wrkMastLogService;

    @Autowired
    private MatService matService;
@@ -74,9 +74,6 @@

    @Autowired
    private OrderDetlPakinService orderDetlPakinService;

    @Autowired
    private NccXsckmxTkWmsService nccXsckmxTkWmsService;

    @RequestMapping("/pda/WarehouseOut/v1")
    @ManagerAuth(memo = "并板途中拣料-参考念初")
@@ -289,40 +286,45 @@

    @RequestMapping(value = "/mat/back")
    @ManagerAuth
    public R pdaSearchBack(@RequestParam String matnr) {
        EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
        wrapper.like("VBATCHCODE", matnr);
        List<NccXsckmxTkWms> nccXsckmxTkWmsList = nccXsckmxTkWmsService.selectList(wrapper);
        if (nccXsckmxTkWmsList.isEmpty()) {
            return R.error("未找到此条码");
    public R pdaSearchBack(@RequestParam String barcode) {
        WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>()
                .eq("barcode", barcode)
                .in("io_type", 101, 103, 107)
                .orderBy("appe_time", false)
        );

        if(null == wrkMastLog) {
            return R.error("未找到此托盘码出库记录");
        }

        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("khmc", nccXsckmxTkWms.getKhmc());
            map.put("matData", matParam);
            list.add(map);
        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                .eq("wrk_no", wrkMastLog.getWrkNo())
                .eq("zpallet", barcode)
                .orderBy("io_time", false)
        );
        if (wrkDetlLogs.isEmpty()) {
            return R.error("未找到此托盘码出库记录明细");
        }
        return R.ok().add(list);

        WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
        String batch = wrkDetlLog.getBatch();

        HashMap<String, Object> map = new HashMap<>();
        Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
        if (mat == null) {
            return R.error("未找到物料明细");
        }
        MatParam matParam = new MatParam();
        Synchro.Copy(mat, matParam);
        matParam.setBatch(batch);
        matParam.setAnfme(0.0D);
        matParam.setAnfme2(0.0D);
        matParam.setTiaoma(batch);

        String[] split = wrkDetlLog.getOrderNo().split("-");
        map.put("orderNo", split[0]);
        map.put("matData", matParam);
        return R.ok().add(map);
    }

    @RequestMapping("/comb/auth")