13

zhang

2025-05-24 954799493a5d4a63a8844fd53e8a14c8ea9f6cea

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

@@ -16,6 +16,10 @@
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.third.CodeDataParam;
import com.zy.asrs.third.CodeParam;
import com.zy.asrs.third.TokenUtils;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -24,6 +28,7 @@
import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -40,8 +45,15 @@

    @Autowired
    private MatService matService;

    @Autowired
    private MobileService mobileService;

    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Value("mes.url")
    private String url;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
@@ -81,6 +93,19 @@
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
    }

    @RequestMapping(value = "/mat/tiaoma/auth")
    @ManagerAuth
    public R findByTiaoMa(@RequestParam("matnr") String matnr) {
        List<CodeDataParam> data = mobileService.getData(TokenUtils.getToken(url), new CodeParam(Arrays.asList(matnr)));
        CodeDataParam codeDataParam = data.get(0);
        Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", codeDataParam.getProductionCode()));
        mat.setMatnr(codeDataParam.getProductionCode());
        mat.setSafeQty(codeDataParam.getQty());
        mat.setUnit(codeDataParam.getBatchNum());
        mat.setMemo(matnr);
        return R.ok(mat);
    }

    @RequestMapping(value = "/mat/list/auth")
@@ -167,13 +192,6 @@
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
    }

    @RequestMapping("/mat/turn/over/out/start")
    @ManagerAuth(memo = "品号移交")
    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {

        return R.ok("品号移交成功");
    }

    @RequestMapping("/mat/turn/over/take/site")
@@ -337,5 +355,15 @@
        return R.ok().add(valueVos);
    }

    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
    }

}