Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

@@ -13,6 +13,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
@@ -127,6 +128,7 @@
        mat.setCreateTime(now);
        mat.setUpdateBy(getUserId());
        mat.setUpdateTime(now);
        mat.setLocType(mat.getTagId());
        mat.setStatus(1);
        if (!matService.insert(mat)) {
            throw new CoolException("添加失败，请联系管理员");
@@ -141,11 +143,19 @@
            return R.error();
        }
        mat.setUpdateBy(getUserId());
        mat.setLocType(mat.getTagId());
        mat.setUpdateTime(new Date());
        matService.updateById(mat);
        return R.ok();
    }

    @PostMapping("mat/batch/auth")
    @ManagerAuth
    public R batchUpdate(@RequestBody BatchMatsUpdateParam params) {

        return  matService.batchInfo(params);
    }

    @RequestMapping(value = "/mat/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam String param){