Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs

czkh

昨天 975823f4d07c91a67162f553be9ff4ac25f3d47d

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

@@ -18,6 +18,7 @@
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;
@@ -28,6 +29,7 @@
import java.util.List;
import java.util.Map;

@Slf4j
@RequestMapping
@RestController
public class BarcodeMatnrController extends BaseController {
@@ -93,6 +95,8 @@
        }
        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("请选择相同托盘码的数据");
            }
        }