#

DELL

2022-05-06 b43d307ac60607bcc556ca52c54cee0176b66273

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

@@ -12,8 +12,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
@@ -23,7 +25,6 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,8 @@

    @Autowired
    private MatCodeService matCodeService;
    @Autowired
    private LocDetlService locDetlService;

    @RequestMapping(value = "/matCode/{id}/auth")
    @ManagerAuth
@@ -118,6 +121,10 @@
            return R.error();
        }
        for (MatCode entity : list){
            Integer count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("mat_no",entity.getMatNo()));
            if(count>0){
                return R.error("产品编码" + entity.getMatNo() + "在库存中已存在，禁止删除");
            }
            matCodeService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -128,8 +135,15 @@
    @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "产品代号数据导出")
    public void export(@RequestParam(required = false) String fileName,
                       @RequestParam(required = false) Integer rowCount,
                       @RequestParam(required = false) String ids,
                       HttpServletResponse response) throws Exception {
        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
        List<MatCode> list = null;
        if(!Cools.isEmpty(ids)){
            list = matCodeService.selectList(new EntityWrapper<MatCode>().last("where mat_no in (" + ids + ")"));
        }else{
            list = matCodeService.selectList(new EntityWrapper<>());
        }
//        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
        List<MatCodeExcel> excels = new ArrayList<>();
        for (MatCode matCode : list) {
            MatCodeExcel excel = VersionUtils.getExcel(matCode);