13

zhang

2025-05-25 3f21b9181b250de317761128771fa551e355a609

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

@@ -13,10 +13,10 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
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.service.OrderDetlService;
import com.zy.asrs.third.CodeDataParam;
import com.zy.asrs.third.CodeParam;
import com.zy.asrs.third.TokenUtils;
@@ -45,6 +45,9 @@

    @Autowired
    private MatService matService;

    @Autowired
    private OrderDetlService orderDetlService;

    @Autowired
    private MobileService mobileService;
@@ -97,9 +100,18 @@

    @RequestMapping(value = "/mat/tiaoma/auth")
    @ManagerAuth
    public R findByTiaoMa(@RequestParam("matnr") String matnr) {
    public R findByTiaoMa(@RequestParam("matnr") String matnr, @RequestParam(required = false, value = "orderNo") String orderNo) {
        List<CodeDataParam> data = mobileService.getData(TokenUtils.getToken(url), new CodeParam(Arrays.asList(matnr)));
        if (data == null || data.isEmpty()) {
            return R.error("条码不存在");
        }
        CodeDataParam codeDataParam = data.get(0);
        if (!Cools.isEmpty(orderNo)) {
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", codeDataParam.getProductionCode()));
            if (orderDetls.isEmpty()) {
                return R.error("该商品不存在在单据中");
            }
        }
        Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", codeDataParam.getProductionCode()));
        mat.setMatnr(codeDataParam.getProductionCode());
        mat.setSafeQty(codeDataParam.getQty());