调试

czkh

4 天以前 9d2d7c23cea8d50716b4bf1272557001ee7874f5

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

@@ -16,7 +16,9 @@
import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,7 @@
import java.util.List;
import java.util.Map;

@Slf4j
@RequestMapping
@RestController
public class BarcodeMatnrController extends BaseController {
@@ -36,6 +39,8 @@
    private MobileService mobileService;
    @Autowired
    private MatService matService;
    @Autowired
    private WaitPakinService waitPakinService;
    /*
    * 物料托盘绑定分页查询
    * */
@@ -79,6 +84,27 @@
        return R.ok();
    }

    /*
    * 批量组托
    * */
    @RequestMapping("/barcodeMatnr/matnrAndBarcode")
    @ManagerAuth(memo = "物料托盘批量组托")
    public R matnrAndBarcode(@RequestBody List<MatBarcode> list) {
        if (Cools.isEmpty(list)){
            return R.error(BaseRes.PARAM);
        }
        for (MatBarcode matBarcode : list) {
            if (!matBarcode.getZpallet().equals(list.get(0).getZpallet())){
                log.info(matBarcode.getZpallet());
                log.info(list.get(0).getZpallet());
                throw new CoolException("请选择相同托盘码的数据");
            }
        }
        waitPakinService.comb(list);
        return R.ok("组托成功");

    }

    /*物料托盘绑定
    *
    * */
@@ -107,6 +133,9 @@
                throw new CoolException("该物料与其他托盘绑定，不能与当前托盘"+waitPakin.getBarcode()+"绑定，与该物料绑定的托盘是"+matBarcode.getZpallet());
            }
        }
        if (mat.getColor().equals("报废")){
            throw new CoolException("该物料已报废，请勿绑定");
        }
        if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
            return R.error(BaseRes.PARAM);
        }
@@ -120,7 +149,7 @@
    @RequestMapping(value = "/barcodeMatnr/add2/auth")
    @ManagerAuth
    public R clamp(WaitPakin waitPakin) {
        if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
        if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
            return R.error(BaseRes.PARAM);
        }
        Mat mat = matService.selectById(waitPakin.getModiUser());
@@ -137,7 +166,8 @@
        CombParam.CombMat combMat=new CombParam.CombMat();
        combMat.setMatnr(mat.getMatnr());
        combMat.setMaktx(mat.getMaktx());
        combMat.setAnfme(waitPakin.getAnfme());
//        combMat.setAnfme(waitPakin.getAnfme());
        combMat.setAnfme(1.0);
        combMats.add(combMat);
        combParam.setBarcode(waitPakin.getBarcode());
        combParam.setCombMats(combMats);